diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.editor.mps
index 697479935..b3d831aa0 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.editor.mps
@@ -3402,30 +3402,6 @@
           <property role="37lx6p" value="hZ7kQ4a/CENTER" />
         </node>
       </node>
-      <node concept="3F0A7n" id="1GpuQyThJlq" role="3EZMnx">
-        <ref role="1NtTu8" to="spwl:5rwT_JnuRcl" resolve="probability" />
-        <node concept="37jFXN" id="1GpuQyTjnAd" role="3F10Kt">
-          <property role="37lx6p" value="hZ7kQ4a/CENTER" />
-        </node>
-        <node concept="VSNWy" id="1GpuQyTjnAi" role="3F10Kt">
-          <property role="1lJzqX" value="9" />
-        </node>
-        <node concept="pkWqt" id="11L6MQb4bLJ" role="pqm2j">
-          <node concept="3clFbS" id="11L6MQb4bLK" role="2VODD2">
-            <node concept="3clFbF" id="11L6MQb4dNE" role="3cqZAp">
-              <node concept="2OqwBi" id="11L6MQb4f1Y" role="3clFbG">
-                <node concept="2OqwBi" id="11L6MQb4e3W" role="2Oq$k0">
-                  <node concept="pncrf" id="11L6MQb4dND" role="2Oq$k0" />
-                  <node concept="3TrcHB" id="11L6MQb4elF" role="2OqNvi">
-                    <ref role="3TsBF5" to="spwl:5rwT_JnuRcl" resolve="probability" />
-                  </node>
-                </node>
-                <node concept="17RvpY" id="11L6MQb4frT" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
       <node concept="2iRkQZ" id="1GpuQyThJl0" role="2iSdaV" />
     </node>
     <node concept="2aJ2om" id="1GpuQyThJkV" role="CpUAK">
@@ -3688,30 +3664,6 @@
       <node concept="PMmxH" id="3f8ZVRXtyns" role="3EZMnx">
         <ref role="PMmxG" node="EBYTccZOox" resolve="FaultTreeElementBaseInInspectorEditorComponent" />
       </node>
-      <node concept="3EZMnI" id="3ZjKZgVHKw4" role="3EZMnx">
-        <node concept="2iRfu4" id="3ZjKZgVHKw5" role="2iSdaV" />
-        <node concept="3F0ifn" id="3ZjKZgVHKw6" role="3EZMnx">
-          <property role="3F0ifm" value="FIT:" />
-        </node>
-        <node concept="3F0A7n" id="3ZjKZgVHKw7" role="3EZMnx">
-          <ref role="1NtTu8" to="spwl:5rwT_JnuRcl" resolve="probability" />
-        </node>
-        <node concept="pkWqt" id="3ZjKZgVHKw8" role="pqm2j">
-          <node concept="3clFbS" id="3ZjKZgVHKw9" role="2VODD2">
-            <node concept="3clFbF" id="3ZjKZgVHKwa" role="3cqZAp">
-              <node concept="2OqwBi" id="3ZjKZgVHKwb" role="3clFbG">
-                <node concept="2OqwBi" id="3ZjKZgVHKwc" role="2Oq$k0">
-                  <node concept="pncrf" id="3ZjKZgVHKwd" role="2Oq$k0" />
-                  <node concept="3TrcHB" id="3ZjKZgVHKwe" role="2OqNvi">
-                    <ref role="3TsBF5" to="spwl:5rwT_JnuRcl" resolve="probability" />
-                  </node>
-                </node>
-                <node concept="17RvpY" id="3ZjKZgVHKwf" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
       <node concept="PMmxH" id="3ZjKZgVHKwg" role="3EZMnx">
         <ref role="PMmxG" node="11L6MQb4h46" resolve="EventSpecEditorComponent" />
       </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.migration.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.migration.mps
index afdb0063c..50ae2cf3e 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.migration.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.migration.mps
@@ -13,265 +13,7 @@
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="slm6" ref="90746344-04fd-4286-97d5-b46ae6a81709/r:52a3d974-bd4f-4651-ba6e-a2de5e336d95(jetbrains.mps.lang.migration/jetbrains.mps.lang.migration.methods)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
-    <import index="spwl" ref="r:ea5ecccc-669e-41c1-a43d-021bc4263d33(com.fasten.safety.ft.structure)" implicit="true" />
   </imports>
-  <registry>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
-      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
-      <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
-        <child id="1154032183016" name="body" index="2LFqv$" />
-      </concept>
-      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
-        <child id="1197027771414" name="operand" index="2Oq$k0" />
-        <child id="1197027833540" name="operation" index="2OqNvi" />
-      </concept>
-      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
-      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
-        <child id="1165602531693" name="superclass" index="1zkMxy" />
-      </concept>
-      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
-        <child id="1068431790190" name="initializer" index="33vP2m" />
-      </concept>
-      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
-        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
-      </concept>
-      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
-      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
-        <child id="5680397130376446158" name="type" index="1tU5fm" />
-      </concept>
-      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
-        <child id="1068580123133" name="returnType" index="3clF45" />
-        <child id="1068580123134" name="parameter" index="3clF46" />
-        <child id="1068580123135" name="body" index="3clF47" />
-      </concept>
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </concept>
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
-        <child id="1068581517665" name="statement" index="3cqZAp" />
-      </concept>
-      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
-        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
-      </concept>
-      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
-        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
-      </concept>
-      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
-        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
-      </concept>
-      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
-      </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
-        <child id="1178549979242" name="visibility" index="1B3o_S" />
-      </concept>
-      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
-    </language>
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl">
-      <concept id="8880393040217246788" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodParameterInstance" flags="ig" index="ffn8J">
-        <reference id="8880393040217294897" name="decl" index="ffrpq" />
-      </concept>
-      <concept id="3751132065236767083" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.DependentTypeInstance" flags="ig" index="q3mfm">
-        <reference id="3751132065236767084" name="decl" index="q3mfh" />
-        <reference id="9097849371505568270" name="point" index="1QQUv3" />
-      </concept>
-      <concept id="3751132065236767060" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodInstance" flags="ig" index="q3mfD">
-        <reference id="19209059688387895" name="decl" index="2VtyIY" />
-      </concept>
-      <concept id="6478870542308708689" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.PropertyInstance" flags="ig" index="3tT0cZ">
-        <reference id="8585153554445465961" name="decl" index="25KYV2" />
-      </concept>
-      <concept id="6478870542308703666" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MemberPlaceholder" flags="ng" index="3tTeZs">
-        <property id="6478870542308703667" name="caption" index="3tTeZt" />
-        <reference id="6478870542308703669" name="decl" index="3tTeZr" />
-      </concept>
-      <concept id="6478870542308871875" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.BooleanPropertyInstance" flags="ig" index="3tYpMH">
-        <property id="6478870542308871876" name="value" index="3tYpME" />
-      </concept>
-      <concept id="6478870542308871428" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.StringPropertyInstance" flags="ig" index="3tYpXE">
-        <property id="6478870542308871429" name="value" index="3tYpXF" />
-      </concept>
-    </language>
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
-        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
-      </concept>
-      <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
-      <concept id="1171323947159" name="jetbrains.mps.lang.smodel.structure.Model_NodesOperation" flags="nn" index="2SmgA7">
-        <child id="1758937410080001570" name="conceptArgument" index="1dBWTz" />
-      </concept>
-      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
-        <reference id="1138056546658" name="link" index="3TtcxE" />
-      </concept>
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-    <language id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration">
-      <concept id="8352104482584315555" name="jetbrains.mps.lang.migration.structure.MigrationScript" flags="ig" index="3SyAh_">
-        <property id="5820409521797704727" name="fromVersion" index="qMTe8" />
-      </concept>
-    </language>
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
-      <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
-        <child id="540871147943773366" name="argument" index="25WWJ7" />
-      </concept>
-      <concept id="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
-        <child id="1153944400369" name="variable" index="2Gsz3X" />
-        <child id="1153944424730" name="inputSequence" index="2GsD0m" />
-      </concept>
-      <concept id="1153944193378" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariable" flags="nr" index="2GrKxI" />
-      <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
-        <reference id="1153944258490" name="variable" index="2Gs0qQ" />
-      </concept>
-      <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
-    </language>
-  </registry>
-  <node concept="3SyAh_" id="2s9yRNfqS29">
-    <property role="qMTe8" value="0" />
-    <property role="TrG5h" value="unifyElementsAndConnections" />
-    <node concept="3Tm1VV" id="2s9yRNfqS2a" role="1B3o_S" />
-    <node concept="3tTeZs" id="2s9yRNfqS2b" role="jymVt">
-      <property role="3tTeZt" value="&lt;no execute after&gt;" />
-      <ref role="3tTeZr" to="slm6:7ay_HjIMt1a" resolve="execute after" />
-    </node>
-    <node concept="3tTeZs" id="2s9yRNfqS2c" role="jymVt">
-      <property role="3tTeZt" value="&lt;no required data&gt;" />
-      <ref role="3tTeZr" to="slm6:5TUCQr2FPTh" resolve="requires annotation data" />
-    </node>
-    <node concept="3tTeZs" id="2s9yRNfqS2d" role="jymVt">
-      <property role="3tTeZt" value="&lt;no produced data&gt;" />
-      <ref role="3tTeZr" to="slm6:5TUCQr2C271" resolve="produces annotation data" />
-    </node>
-    <node concept="2tJIrI" id="2s9yRNfqS2e" role="jymVt" />
-    <node concept="3tYpMH" id="2s9yRNfqS2f" role="jymVt">
-      <property role="TrG5h" value="isRerunnable" />
-      <property role="3tYpME" value="true" />
-      <ref role="25KYV2" to="slm6:1JWcQ2VeWIs" resolve="isRerunnable" />
-      <node concept="3Tm1VV" id="2s9yRNfqS2g" role="1B3o_S" />
-      <node concept="10P_77" id="2s9yRNfqS2h" role="1tU5fm" />
-    </node>
-    <node concept="3tYpXE" id="3ZjKZgVDWDh" role="jymVt">
-      <property role="TrG5h" value="description" />
-      <property role="3tYpXF" value="Unify Elements and Connections" />
-      <ref role="25KYV2" to="slm6:1_lSsE3RFpE" resolve="description" />
-      <node concept="3Tm1VV" id="3ZjKZgVDWDj" role="1B3o_S" />
-      <node concept="17QB3L" id="3ZjKZgVDWDk" role="1tU5fm" />
-    </node>
-    <node concept="q3mfD" id="2s9yRNfqS2j" role="jymVt">
-      <property role="TrG5h" value="execute" />
-      <ref role="2VtyIY" to="slm6:4ubqdNOF9cA" resolve="execute" />
-      <node concept="3Tm1VV" id="2s9yRNfqS2l" role="1B3o_S" />
-      <node concept="3clFbS" id="2s9yRNfqS2n" role="3clF47">
-        <node concept="2Gpval" id="2s9yRNfqSyC" role="3cqZAp">
-          <node concept="2GrKxI" id="2s9yRNfqSyH" role="2Gsz3X">
-            <property role="TrG5h" value="mod" />
-          </node>
-          <node concept="3clFbS" id="2s9yRNfqSyR" role="2LFqv$">
-            <node concept="3cpWs8" id="2s9yRNfqSGz" role="3cqZAp">
-              <node concept="3cpWsn" id="2s9yRNfqSGA" role="3cpWs9">
-                <property role="TrG5h" value="mm" />
-                <node concept="H_c77" id="2s9yRNfqSGy" role="1tU5fm" />
-                <node concept="2GrUjf" id="2s9yRNfqSHG" role="33vP2m">
-                  <ref role="2Gs0qQ" node="2s9yRNfqSyH" resolve="mod" />
-                </node>
-              </node>
-            </node>
-            <node concept="2Gpval" id="2s9yRNfqTQw" role="3cqZAp">
-              <node concept="2GrKxI" id="2s9yRNfqTQA" role="2Gsz3X">
-                <property role="TrG5h" value="ft" />
-              </node>
-              <node concept="3clFbS" id="2s9yRNfqTQM" role="2LFqv$">
-                <node concept="3clFbF" id="2s9yRNfqTVQ" role="3cqZAp">
-                  <node concept="2OqwBi" id="2s9yRNfqVDu" role="3clFbG">
-                    <node concept="2OqwBi" id="2s9yRNfqU4H" role="2Oq$k0">
-                      <node concept="2GrUjf" id="2s9yRNfqTVP" role="2Oq$k0">
-                        <ref role="2Gs0qQ" node="2s9yRNfqTQA" resolve="ft" />
-                      </node>
-                      <node concept="3Tsc0h" id="2s9yRNfqUlV" role="2OqNvi">
-                        <ref role="3TtcxE" to="spwl:2s9yRNfpPP4" resolve="content" />
-                      </node>
-                    </node>
-                    <node concept="X8dFx" id="2s9yRNfqXwc" role="2OqNvi">
-                      <node concept="2OqwBi" id="2s9yRNfqXX5" role="25WWJ7">
-                        <node concept="2GrUjf" id="2s9yRNfqXDP" role="2Oq$k0">
-                          <ref role="2Gs0qQ" node="2s9yRNfqTQA" resolve="ft" />
-                        </node>
-                        <node concept="3Tsc0h" id="2s9yRNfqZFN" role="2OqNvi">
-                          <ref role="3TtcxE" to="spwl:5rwT_JnuR3W" resolve="elements" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="2s9yRNfr02J" role="3cqZAp">
-                  <node concept="2OqwBi" id="2s9yRNfr330" role="3clFbG">
-                    <node concept="2OqwBi" id="2s9yRNfr0bJ" role="2Oq$k0">
-                      <node concept="2GrUjf" id="2s9yRNfr02H" role="2Oq$k0">
-                        <ref role="2Gs0qQ" node="2s9yRNfqTQA" resolve="ft" />
-                      </node>
-                      <node concept="3Tsc0h" id="2s9yRNfr1UU" role="2OqNvi">
-                        <ref role="3TtcxE" to="spwl:2s9yRNfpPP4" resolve="content" />
-                      </node>
-                    </node>
-                    <node concept="X8dFx" id="2s9yRNfr5IA" role="2OqNvi">
-                      <node concept="2OqwBi" id="2s9yRNfr9eh" role="25WWJ7">
-                        <node concept="2GrUjf" id="2s9yRNfr7Cp" role="2Oq$k0">
-                          <ref role="2Gs0qQ" node="2s9yRNfqTQA" resolve="ft" />
-                        </node>
-                        <node concept="3Tsc0h" id="2s9yRNfrbF_" role="2OqNvi">
-                          <ref role="3TtcxE" to="spwl:5rwT_JnuR3Y" resolve="connections" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="2OqwBi" id="2s9yRNfqSUq" role="2GsD0m">
-                <node concept="37vLTw" id="2s9yRNfqSMX" role="2Oq$k0">
-                  <ref role="3cqZAo" node="2s9yRNfqSGA" resolve="mm" />
-                </node>
-                <node concept="2SmgA7" id="2s9yRNfqTwC" role="2OqNvi">
-                  <node concept="chp4Y" id="2s9yRNfqTB9" role="1dBWTz">
-                    <ref role="cht4Q" to="spwl:5rwT_JnuQVv" resolve="FaultTree" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2OqwBi" id="2s9yRNfqSdR" role="2GsD0m">
-            <node concept="37vLTw" id="2s9yRNfqS8e" role="2Oq$k0">
-              <ref role="3cqZAo" node="2s9yRNfqS2p" resolve="m" />
-            </node>
-            <node concept="liA8E" id="2s9yRNfqSqN" role="2OqNvi">
-              <ref role="37wK5l" to="lui2:~SModule.getModels()" resolve="getModels" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="ffn8J" id="2s9yRNfqS2p" role="3clF46">
-        <property role="TrG5h" value="m" />
-        <ref role="ffrpq" to="slm6:7fCCGqboj9J" resolve="m" />
-        <node concept="3uibUv" id="2s9yRNfqS2o" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
-        </node>
-      </node>
-      <node concept="q3mfm" id="2s9yRNfqS2q" role="3clF45">
-        <ref role="q3mfh" to="slm6:4F5w8gPXEEe" />
-        <ref role="1QQUv3" node="2s9yRNfqS2j" resolve="execute" />
-      </node>
-    </node>
-    <node concept="3tTeZs" id="2s9yRNfqS2r" role="jymVt">
-      <property role="3tTeZt" value="&lt;no result checking&gt;" />
-      <ref role="3tTeZr" to="slm6:1JWcQ2VeXpD" resolve="check" />
-    </node>
-    <node concept="3uibUv" id="2s9yRNfqS2s" role="1zkMxy">
-      <ref role="3uigEE" to="slm6:5TUCQr2ybBO" resolve="HasMigrationScriptReference" />
-    </node>
-  </node>
+  <registry />
 </model>
 
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.structure.mps
index 45b0c4a60..6b626ccdc 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.structure.mps
@@ -29,7 +29,6 @@
       </concept>
     </language>
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
-      <concept id="1224240836180" name="jetbrains.mps.lang.structure.structure.DeprecatedNodeAnnotation" flags="ig" index="asaX9" />
       <concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
         <property id="6714410169261853888" name="conceptId" index="EcuMT" />
         <property id="4628067390765907488" name="conceptShortDescription" index="R4oN_" />
@@ -63,7 +62,6 @@
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
@@ -77,22 +75,6 @@
     <property role="34LRSv" value="fault tree" />
     <property role="R4oN_" value="fault tree" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyj" id="5rwT_JnuR3W" role="1TKVEi">
-      <property role="IQ2ns" value="6260256764176593148" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="elements" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
-      <ref role="20lvS9" node="5rwT_JnuR3U" resolve="FaultTreeElementBase" />
-      <node concept="asaX9" id="2s9yRNfpQfn" role="lGtFl" />
-    </node>
-    <node concept="1TJgyj" id="5rwT_JnuR3Y" role="1TKVEi">
-      <property role="IQ2ns" value="6260256764176593150" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="connections" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
-      <ref role="20lvS9" node="5rwT_JnuR3V" resolve="FaultTreeConnectionBase" />
-      <node concept="asaX9" id="2s9yRNfpQfx" role="lGtFl" />
-    </node>
     <node concept="1TJgyj" id="2s9yRNfpPP4" role="1TKVEi">
       <property role="IQ2ns" value="2812932810441448772" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
@@ -220,12 +202,6 @@
       <property role="20kJfa" value="spec" />
       <ref role="20lvS9" node="11L6MQb45$I" resolve="EventSpecBase" />
     </node>
-    <node concept="1TJgyi" id="5rwT_JnuRcl" role="1TKVEl">
-      <property role="IQ2nx" value="6260256764176593685" />
-      <property role="TrG5h" value="probability" />
-      <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
-      <node concept="asaX9" id="11L6MQb4bLB" role="lGtFl" />
-    </node>
     <node concept="PrWs8" id="5rwT_JnuRcj" role="PzmwI">
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
     </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.typesystem.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.typesystem.mps
index e04e76670..bfc39a0be 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.typesystem.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.typesystem.mps
@@ -63,7 +63,6 @@
       <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
       <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
       <concept id="1225271369338" name="jetbrains.mps.baseLanguage.structure.IsEmptyOperation" flags="nn" index="17RlXB" />
-      <concept id="1225271408483" name="jetbrains.mps.baseLanguage.structure.IsNotEmptyOperation" flags="nn" index="17RvpY" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -130,9 +129,6 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem">
-      <concept id="1207055528241" name="jetbrains.mps.lang.typesystem.structure.WarningStatement" flags="nn" index="a7r0C">
-        <child id="1207055552304" name="warningText" index="a7wSD" />
-      </concept>
       <concept id="7992060018732187438" name="jetbrains.mps.lang.typesystem.structure.ReportErrorStatementAnnotation" flags="ng" index="AMVWg" />
       <concept id="1175517767210" name="jetbrains.mps.lang.typesystem.structure.ReportErrorStatement" flags="nn" index="2MkqsV">
         <child id="1175517851849" name="errorString" index="2MkJ7o" />
@@ -140,7 +136,6 @@
       <concept id="1216383170661" name="jetbrains.mps.lang.typesystem.structure.TypesystemQuickFix" flags="ng" index="Q5z_Y">
         <child id="1216383424566" name="executeBlock" index="Q6x$H" />
         <child id="1216383476350" name="quickFixArgument" index="Q6Id_" />
-        <child id="1216391046856" name="descriptionBlock" index="QzAvj" />
       </concept>
       <concept id="1216383287005" name="jetbrains.mps.lang.typesystem.structure.QuickFixExecuteBlock" flags="in" index="Q5ZZ6" />
       <concept id="1216383482742" name="jetbrains.mps.lang.typesystem.structure.QuickFixArgument" flags="ng" index="Q6JDH">
@@ -149,7 +144,6 @@
       <concept id="1216390348809" name="jetbrains.mps.lang.typesystem.structure.QuickFixArgumentReference" flags="nn" index="QwW4i">
         <reference id="1216390348810" name="quickFixArgument" index="QwW4h" />
       </concept>
-      <concept id="1216390987552" name="jetbrains.mps.lang.typesystem.structure.QuickFixDescriptionBlock" flags="in" index="QznSV" />
       <concept id="1195213580585" name="jetbrains.mps.lang.typesystem.structure.AbstractCheckingRule" flags="ig" index="18hYwZ">
         <child id="1195213635060" name="body" index="18ibNy" />
       </concept>
@@ -227,7 +221,6 @@
       <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
         <reference id="1138056546658" name="link" index="3TtcxE" />
       </concept>
-      <concept id="1215467301810" name="jetbrains.mps.lang.smodel.structure.Property_RemoveOperation" flags="nn" index="3ZvMEC" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
@@ -261,39 +254,6 @@
     <property role="TrG5h" value="check_EventBase" />
     <property role="3GE5qa" value="events.base" />
     <node concept="3clFbS" id="11L6MQb4hf7" role="18ibNy">
-      <node concept="3clFbJ" id="11L6MQb4hfd" role="3cqZAp">
-        <node concept="2OqwBi" id="11L6MQb4i0j" role="3clFbw">
-          <node concept="2OqwBi" id="11L6MQb4hqW" role="2Oq$k0">
-            <node concept="1YBJjd" id="11L6MQb4hfp" role="2Oq$k0">
-              <ref role="1YBMHb" node="11L6MQb4hf9" resolve="eventBase" />
-            </node>
-            <node concept="3TrcHB" id="11L6MQb4hBB" role="2OqNvi">
-              <ref role="3TsBF5" to="spwl:5rwT_JnuRcl" resolve="probability" />
-            </node>
-          </node>
-          <node concept="17RvpY" id="11L6MQb4ifr" role="2OqNvi" />
-        </node>
-        <node concept="3clFbS" id="11L6MQb4hff" role="3clFbx">
-          <node concept="a7r0C" id="11L6MQb4ifD" role="3cqZAp">
-            <node concept="Xl_RD" id="11L6MQb4ifV" role="a7wSD">
-              <property role="Xl_RC" value="'probability' field is deprecated - please delete this field and use events specifications in inspector" />
-            </node>
-            <node concept="1YBJjd" id="11L6MQb4ik5" role="1urrMF">
-              <ref role="1YBMHb" node="11L6MQb4hf9" resolve="eventBase" />
-            </node>
-            <node concept="3Cnw8n" id="11L6MQb5OAS" role="1urrFz">
-              <ref role="QpYPw" node="11L6MQb5NcQ" resolve="deleteProperty" />
-              <node concept="3CnSsL" id="11L6MQb5OBp" role="3Coj4f">
-                <ref role="QkamJ" node="11L6MQb5NBg" resolve="eb" />
-                <node concept="1YBJjd" id="11L6MQb5OBD" role="3CoRuB">
-                  <ref role="1YBMHb" node="11L6MQb4hf9" resolve="eventBase" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3clFbH" id="33PksMocP7" role="3cqZAp" />
       <node concept="3clFbJ" id="33PksMocPB" role="3cqZAp">
         <node concept="3clFbS" id="33PksMocPD" role="3clFbx">
           <node concept="2MkqsV" id="33PksMonKM" role="3cqZAp">
@@ -342,42 +302,6 @@
       <ref role="1YaFvo" to="spwl:5rwT_JnuRci" resolve="EventBase" />
     </node>
   </node>
-  <node concept="Q5z_Y" id="11L6MQb5NcQ">
-    <property role="3GE5qa" value="events.base" />
-    <property role="TrG5h" value="deleteProperty" />
-    <node concept="Q6JDH" id="11L6MQb5NBg" role="Q6Id_">
-      <property role="TrG5h" value="eb" />
-      <node concept="3Tqbb2" id="11L6MQb5NBp" role="Q6QK4">
-        <ref role="ehGHo" to="spwl:5rwT_JnuRci" resolve="EventBase" />
-      </node>
-    </node>
-    <node concept="Q5ZZ6" id="11L6MQb5NcR" role="Q6x$H">
-      <node concept="3clFbS" id="11L6MQb5NcS" role="2VODD2">
-        <node concept="3clFbF" id="11L6MQb5NBK" role="3cqZAp">
-          <node concept="2OqwBi" id="11L6MQb5OiW" role="3clFbG">
-            <node concept="2OqwBi" id="11L6MQb5NLu" role="2Oq$k0">
-              <node concept="QwW4i" id="11L6MQb5NBJ" role="2Oq$k0">
-                <ref role="QwW4h" node="11L6MQb5NBg" resolve="eb" />
-              </node>
-              <node concept="3TrcHB" id="11L6MQb5NYi" role="2OqNvi">
-                <ref role="3TsBF5" to="spwl:5rwT_JnuRcl" resolve="probability" />
-              </node>
-            </node>
-            <node concept="3ZvMEC" id="11L6MQb5Oyh" role="2OqNvi" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="QznSV" id="11L6MQb5Nd9" role="QzAvj">
-      <node concept="3clFbS" id="11L6MQb5Nda" role="2VODD2">
-        <node concept="3clFbF" id="11L6MQb5NhI" role="3cqZAp">
-          <node concept="Xl_RD" id="11L6MQb5NhH" role="3clFbG">
-            <property role="Xl_RC" value="Delete Probability Property" />
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="18kY7G" id="7wRJ5ynOyOe">
     <property role="TrG5h" value="check_GateBase" />
     <property role="3GE5qa" value="gates" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.behavior.mps
index 8f74fa49a..3614047fe 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.behavior.mps
@@ -169,43 +169,6 @@
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
     </language>
   </registry>
-  <node concept="13h7C7" id="3d5AacfxFe9">
-    <ref role="13h7C2" to="wvti:4KIvh_tvCfy" resolve="TemplateWord_old" />
-    <node concept="13hLZK" id="3d5AacfxFea" role="13h7CW">
-      <node concept="3clFbS" id="3d5AacfxFeb" role="2VODD2" />
-    </node>
-    <node concept="13i0hz" id="3d5AacfxFek" role="13h7CS">
-      <property role="TrG5h" value="toTextString" />
-      <ref role="13i0hy" to="tbr6:3Q5enzfMT4t" resolve="toTextString" />
-      <node concept="3Tm1VV" id="3d5AacfxFel" role="1B3o_S" />
-      <node concept="3clFbS" id="3d5AacfxFeq" role="3clF47">
-        <node concept="3clFbF" id="3d5AacfxFvz" role="3cqZAp">
-          <node concept="3cpWs3" id="3d5AacfxHw$" role="3clFbG">
-            <node concept="Xl_RD" id="3d5AacfxHFF" role="3uHU7w">
-              <property role="Xl_RC" value=" }" />
-            </node>
-            <node concept="3cpWs3" id="3d5AacfxGgr" role="3uHU7B">
-              <node concept="Xl_RD" id="3d5AacfxFvy" role="3uHU7B">
-                <property role="Xl_RC" value="{ " />
-              </node>
-              <node concept="2OqwBi" id="3d5AacfxGR$" role="3uHU7w">
-                <node concept="2OqwBi" id="3d5AacfxGtV" role="2Oq$k0">
-                  <node concept="13iPFW" id="3d5AacfxGgN" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="3d5AacfxGCz" role="2OqNvi">
-                    <ref role="3Tt5mk" to="wvti:3GRi4m$qYoV" resolve="text_old" />
-                  </node>
-                </node>
-                <node concept="2qgKlT" id="3d5AacfxH4h" role="2OqNvi">
-                  <ref role="37wK5l" to="tbr6:3Q5enzfMT4l" resolve="asTextString" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="17QB3L" id="3d5AacfxFer" role="3clF45" />
-    </node>
-  </node>
   <node concept="13h7C7" id="4ziKDEnle8g">
     <property role="3GE5qa" value="connections" />
     <ref role="13h7C2" to="wvti:5Ac1Q93JDnH" resolve="SupportedByConnectionWord" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.editor.mps
index f1b319fd3..351c45428 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.editor.mps
@@ -19,11 +19,6 @@
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
-      <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
-        <child id="414384289274416996" name="parts" index="3ft7WO" />
-      </concept>
-      <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
       <concept id="1071666914219" name="jetbrains.mps.lang.editor.structure.ConceptEditorDeclaration" flags="ig" index="24kQdi">
         <child id="2597348684684069742" name="contextHints" index="CpUAK" />
       </concept>
@@ -53,39 +48,25 @@
       <concept id="1078939183254" name="jetbrains.mps.lang.editor.structure.CellModel_Component" flags="sg" stub="3162947552742194261" index="PMmxH">
         <reference id="1078939183255" name="editorComponent" index="PMmxG" />
       </concept>
-      <concept id="4323500428121233431" name="jetbrains.mps.lang.editor.structure.EditorCellId" flags="ng" index="2SqB2G" />
       <concept id="1186403694788" name="jetbrains.mps.lang.editor.structure.ColorStyleClassItem" flags="ln" index="VaVBg">
         <property id="1186403713874" name="color" index="Vb096" />
       </concept>
       <concept id="1186404549998" name="jetbrains.mps.lang.editor.structure.ForegroundColorStyleClassItem" flags="ln" index="VechU" />
-      <concept id="615427434521884870" name="jetbrains.mps.lang.editor.structure.SubstituteMenuPart_Subconcepts" flags="ng" index="2VfDsV" />
       <concept id="1186414536763" name="jetbrains.mps.lang.editor.structure.BooleanStyleSheetItem" flags="ln" index="VOi$J">
         <property id="1186414551515" name="flag" index="VOm3f" />
       </concept>
       <concept id="1186414860679" name="jetbrains.mps.lang.editor.structure.EditableStyleClassItem" flags="ln" index="VPxyj" />
       <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
-        <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
-        <child id="5991739802479788259" name="type" index="22hAXT" />
-      </concept>
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
       <concept id="1233759184865" name="jetbrains.mps.lang.editor.structure.PunctuationRightStyleClassItem" flags="ln" index="11LMrY" />
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
-      <concept id="1215007762405" name="jetbrains.mps.lang.editor.structure.FloatStyleClassItem" flags="ln" index="3$6MrZ">
-        <property id="1215007802031" name="value" index="3$6WeP" />
-      </concept>
-      <concept id="1215007883204" name="jetbrains.mps.lang.editor.structure.PaddingLeftStyleClassItem" flags="ln" index="3$7fVu" />
-      <concept id="1215007897487" name="jetbrains.mps.lang.editor.structure.PaddingRightStyleClassItem" flags="ln" index="3$7jql" />
       <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
         <property id="1140017977771" name="readOnly" index="1Intyy" />
         <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
       </concept>
-      <concept id="1073389214265" name="jetbrains.mps.lang.editor.structure.EditorCellModel" flags="ng" index="3EYTF0">
-        <child id="4323500428121274054" name="id" index="2SqHTX" />
-      </concept>
       <concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
         <child id="1106270802874" name="cellLayout" index="2iSdaV" />
         <child id="1073389446424" name="childCellModel" index="3EZMnx" />
@@ -127,9 +108,6 @@
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
-      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
-        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
-      </concept>
       <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
         <reference id="1144433057691" name="classifier" index="1PxDUh" />
       </concept>
@@ -168,14 +146,6 @@
         <child id="1163668934364" name="ifFalse" index="3K4GZi" />
       </concept>
     </language>
-    <language id="52733268-be24-4f5f-ab84-a73b7c0c03b0" name="de.slisson.mps.richtext.customcell">
-      <concept id="1161622981231" name="de.slisson.mps.richtext.customcell.structure.ConceptFunctionParameter_cell" flags="nn" index="1Q80Hx" />
-      <concept id="1176749715029" name="de.slisson.mps.richtext.customcell.structure.QueryFunction_Cell" flags="in" index="3VJUX5" />
-      <concept id="2490242408670732052" name="de.slisson.mps.richtext.customcell.structure.CellModel_CustomFactory" flags="ng" index="3ZSo5i">
-        <child id="1073389446424" name="childCellModel" index="3EZMny" />
-        <child id="2490242408670937967" name="factoryMethod" index="3ZZHOD" />
-      </concept>
-    </language>
     <language id="7e450f4e-1ac3-41ef-a851-4598161bdb94" name="de.slisson.mps.tables">
       <concept id="1397920687865064415" name="de.slisson.mps.tables.structure.ChildsVertical" flags="ng" index="2reSaE" />
       <concept id="1397920687865064509" name="de.slisson.mps.tables.structure.ChildCollection" flags="ng" index="2reSl8">
@@ -207,9 +177,6 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
     </language>
   </registry>
   <node concept="24kQdi" id="5Ac1Q93IJWC">
@@ -631,55 +598,6 @@
       <node concept="2iRfu4" id="5Ac1Q93JDoo" role="2iSdaV" />
     </node>
   </node>
-  <node concept="24kQdi" id="4KIvh_tvCkS">
-    <ref role="1XX52x" to="wvti:4KIvh_tvCfy" resolve="TemplateWord_old" />
-    <node concept="3EZMnI" id="4SCnVTc$00X" role="2wV5jI">
-      <node concept="3ZSo5i" id="MUKpduBfKt" role="3EZMnx">
-        <node concept="3VJUX5" id="MUKpduBfKz" role="3ZZHOD">
-          <node concept="3clFbS" id="MUKpduBfK$" role="2VODD2">
-            <node concept="3clFbF" id="MUKpduBJrh" role="3cqZAp">
-              <node concept="2YIFZM" id="MUKpduBJsj" role="3clFbG">
-                <ref role="37wK5l" to="23h6:2af7$rttluc" resolve="modify" />
-                <ref role="1Pybhc" to="23h6:2af7$rtxPFl" resolve="TextCellModifier" />
-                <node concept="1Q80Hx" id="MUKpduBJuQ" role="37wK5m" />
-              </node>
-            </node>
-            <node concept="3cpWs6" id="MUKpduBJ$r" role="3cqZAp">
-              <node concept="1Q80Hx" id="MUKpduBJBf" role="3cqZAk" />
-            </node>
-          </node>
-        </node>
-        <node concept="3EZMnI" id="4KIvh_tvCkU" role="3EZMny">
-          <node concept="3F0ifn" id="4KIvh_tvCl1" role="3EZMnx">
-            <property role="3F0ifm" value="{" />
-            <node concept="VechU" id="4SCnVTc$tMF" role="3F10Kt">
-              <property role="Vb096" value="fLwANPu/blue" />
-            </node>
-            <node concept="3$7jql" id="4SCnVTcAiPR" role="3F10Kt">
-              <property role="3$6WeP" value="0.5" />
-            </node>
-          </node>
-          <node concept="3F1sOY" id="2UJp0AhteVL" role="3EZMnx">
-            <ref role="1NtTu8" to="wvti:3GRi4m$qYoV" resolve="text_old" />
-          </node>
-          <node concept="3F0ifn" id="3woDyDnZoAH" role="3EZMnx">
-            <property role="3F0ifm" value="}" />
-            <node concept="2SqB2G" id="4jyWgNi3SSb" role="2SqHTX">
-              <property role="TrG5h" value="coll" />
-            </node>
-            <node concept="VechU" id="4SCnVTc_AKk" role="3F10Kt">
-              <property role="Vb096" value="fLwANPu/blue" />
-            </node>
-            <node concept="3$7fVu" id="4SCnVTcAJZH" role="3F10Kt">
-              <property role="3$6WeP" value="0.5" />
-            </node>
-          </node>
-          <node concept="2iRfu4" id="4jyWgNi3SSd" role="2iSdaV" />
-        </node>
-      </node>
-      <node concept="2iRkQZ" id="4SCnVTc$00Y" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="24kQdi" id="1To8c6dXRnY">
     <ref role="1XX52x" to="wvti:1To8c6dXRnv" resolve="DocumentGSNWord" />
     <node concept="3EZMnI" id="1To8c6dXRo0" role="2wV5jI">
@@ -752,11 +670,6 @@
       <node concept="2iRfu4" id="2UJp0AhtoJG" role="2iSdaV" />
     </node>
   </node>
-  <node concept="22mcaB" id="x1FXqA6lN">
-    <ref role="aqKnT" to="wvti:4KIvh_tvCfy" resolve="TemplateWord_old" />
-    <node concept="22hDWj" id="x1FXqA6lO" role="22hAXT" />
-    <node concept="2VfDsV" id="x1FXqA6lP" role="3ft7WO" />
-  </node>
   <node concept="24kQdi" id="5t37uj6vdhv">
     <ref role="1XX52x" to="wvti:5t37uj6vdh0" resolve="GoalStructureWord" />
     <node concept="3EZMnI" id="5t37uj6vdhx" role="2wV5jI">
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.structure.mps
index 5349a5614..2d028e3c2 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.structure.mps
@@ -14,9 +14,6 @@
   </imports>
   <registry>
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
-      <concept id="1224240836180" name="jetbrains.mps.lang.structure.structure.DeprecatedNodeAnnotation" flags="ig" index="asaX9">
-        <property id="1225118933224" name="comment" index="YLQ7P" />
-      </concept>
       <concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
         <property id="6714410169261853888" name="conceptId" index="EcuMT" />
         <property id="4628067390765907488" name="conceptShortDescription" index="R4oN_" />
@@ -43,7 +40,6 @@
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
@@ -233,28 +229,6 @@
       <ref role="20lvS9" to="87nw:2dWzqxEB$Tx" resolve="Text" />
     </node>
   </node>
-  <node concept="1TIwiD" id="4KIvh_tvCfy">
-    <property role="EcuMT" value="5489462543707440098" />
-    <property role="TrG5h" value="TemplateWord_old" />
-    <property role="34LRSv" value="{" />
-    <property role="R4oN_" value="template word" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyj" id="3GRi4m$qYoV" role="1TKVEi">
-      <property role="IQ2ns" value="4266958635905312315" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="text_old" />
-      <ref role="20lvS9" to="87nw:2dWzqxEB$Tx" resolve="Text" />
-      <node concept="asaX9" id="x1FXqA6lY" role="lGtFl">
-        <property role="YLQ7P" value="The link was moved to concept &quot;com.mbeddr.formal.safety.gsn.ext.structure.TemplateWord&quot;" />
-      </node>
-    </node>
-    <node concept="PrWs8" id="4KIvh_tvCfz" role="PzmwI">
-      <ref role="PrY4T" to="87nw:2dWzqxEBBFG" resolve="IWord" />
-    </node>
-    <node concept="asaX9" id="x1FXqA6lM" role="lGtFl">
-      <property role="YLQ7P" value="The concept was moved to language &quot;com.mbeddr.formal.safety.gsn.ext&quot;" />
-    </node>
-  </node>
   <node concept="1TIwiD" id="5t37uj6vdh0">
     <property role="EcuMT" value="6287902373159162944" />
     <property role="TrG5h" value="GoalStructureWord" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.migration.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.migration.mps
index 8ee3ef3a4..933b584f6 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.migration.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.migration.mps
@@ -7,244 +7,6 @@
     <devkit ref="2787ae0c-1f54-4fbf-b0b7-caf2b5beecbc(jetbrains.mps.devkit.aspect.migration)" />
   </languages>
   <imports />
-  <registry>
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="6911370362349121511" name="jetbrains.mps.lang.smodel.structure.ConceptId" flags="nn" index="2x4n5u">
-        <property id="6911370362349122519" name="conceptName" index="2x4mPI" />
-        <property id="6911370362349121516" name="conceptId" index="2x4n5l" />
-        <child id="6911370362349121514" name="languageIdentity" index="2x4n5j" />
-      </concept>
-      <concept id="8415841354032330476" name="jetbrains.mps.lang.smodel.structure.ReferenceLinkId" flags="ng" index="HUanN">
-        <property id="8415841354032330479" name="referenceName" index="HUanK" />
-        <property id="8415841354032330478" name="referenceId" index="HUanL" />
-        <child id="8415841354032330477" name="conceptIdentity" index="HUanM" />
-      </concept>
-      <concept id="8415841354032330471" name="jetbrains.mps.lang.smodel.structure.ContainmentLinkId" flags="ng" index="HUanS">
-        <property id="8415841354032330474" name="linkName" index="HUanP" />
-        <property id="8415841354032330473" name="linkId" index="HUanQ" />
-        <child id="8415841354032330472" name="conceptIdentity" index="HUanR" />
-      </concept>
-      <concept id="3542851458883438784" name="jetbrains.mps.lang.smodel.structure.LanguageId" flags="nn" index="2V$Bhx">
-        <property id="3542851458883439831" name="namespace" index="2V$B1Q" />
-        <property id="3542851458883439832" name="languageId" index="2V$B1T" />
-      </concept>
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
-        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
-      </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-    <language id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration">
-      <concept id="3116305438947623354" name="jetbrains.mps.lang.migration.structure.MoveContainmentLink" flags="ng" index="7a1rN">
-        <child id="8415841354033040054" name="targetId" index="HTpAD" />
-        <child id="8415841354033040053" name="sourceId" index="HTpAE" />
-      </concept>
-      <concept id="3116305438947623351" name="jetbrains.mps.lang.migration.structure.MoveReferenceLink" flags="ng" index="7a1rY">
-        <child id="8415841354033040062" name="targetId" index="HTpAx" />
-        <child id="8415841354033040061" name="sourceId" index="HTpAy" />
-      </concept>
-      <concept id="3116305438947553624" name="jetbrains.mps.lang.migration.structure.RefactoringPart" flags="ng" index="7amoh">
-        <property id="3628660716136424362" name="participant" index="hSBgo" />
-        <child id="3628660716136424366" name="finalState" index="hSBgs" />
-        <child id="3628660716136424364" name="initialState" index="hSBgu" />
-      </concept>
-      <concept id="2864063292004102367" name="jetbrains.mps.lang.migration.structure.ReflectionNodeReference" flags="ng" index="2pBcaW">
-        <property id="2864063292004102809" name="nodeName" index="2pBc3U" />
-        <property id="2864063292004103235" name="modelRef" index="2pBcow" />
-        <property id="2864063292004103247" name="nodeId" index="2pBcoG" />
-      </concept>
-      <concept id="2015900981881695631" name="jetbrains.mps.lang.migration.structure.RefactoringLog" flags="ng" index="W$Crc">
-        <property id="2015900981881695633" name="fromVersion" index="W$Cri" />
-        <child id="2015900981881695634" name="part" index="W$Crh" />
-        <child id="3597905718825595708" name="options" index="1w76sc" />
-      </concept>
-      <concept id="7431903976166007326" name="jetbrains.mps.lang.migration.structure.MoveNodeMigrationPart" flags="ng" index="Z4OXk">
-        <child id="3116305438947564633" name="specialization" index="7agGg" />
-        <child id="7431903976166276375" name="toNode" index="Z5P1t" />
-        <child id="7431903976166276373" name="fromNode" index="Z5P1v" />
-      </concept>
-      <concept id="7431903976166443707" name="jetbrains.mps.lang.migration.structure.PureMigrationScript" flags="ng" index="Z5qvL">
-        <property id="7431903976166443708" name="fromVersion" index="Z5qvQ" />
-        <property id="2151301691306162408" name="description" index="1AQGQl" />
-        <child id="7431903976166447091" name="part" index="Z5rET" />
-      </concept>
-      <concept id="3597905718825595712" name="jetbrains.mps.lang.migration.structure.RefactoringOptions" flags="ng" index="1w76tK">
-        <child id="3597905718825595718" name="options" index="1w76tQ" />
-      </concept>
-      <concept id="3597905718825595715" name="jetbrains.mps.lang.migration.structure.RefactoringOption" flags="ng" index="1w76tN">
-        <property id="3597905718825595716" name="optionId" index="1w76tO" />
-        <property id="3597905718825650036" name="description" index="1w7ld4" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="W$Crc" id="x1FXqHS9Z">
-    <property role="3GE5qa" value="refactoring" />
-    <property role="W$Cri" value="0" />
-    <property role="TrG5h" value="Update References: explanation-&gt;explanation" />
-    <node concept="1w76tK" id="x1FXqHSa0" role="1w76sc">
-      <node concept="1w76tN" id="x1FXqHSa1" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.updateLocalInstances" />
-        <property role="1w7ld4" value="Update instances in current project" />
-      </node>
-      <node concept="1w76tN" id="x1FXqHSa2" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.updateModelImports" />
-        <property role="1w7ld4" value="Update model imports" />
-      </node>
-      <node concept="1w76tN" id="x1FXqHSa3" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.updateReferencesParticipant" />
-        <property role="1w7ld4" value="Update references" />
-      </node>
-      <node concept="1w76tN" id="x1FXqHSa4" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.writeMigrationScript" />
-        <property role="1w7ld4" value="Write migration script" />
-      </node>
-      <node concept="1w76tN" id="x1FXqHSa5" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.writeRefactoringLog" />
-        <property role="1w7ld4" value="Write refactoring log" />
-      </node>
-    </node>
-    <node concept="7amoh" id="x1FXqHSa7" role="W$Crh">
-      <property role="hSBgo" value="moveNode.updateReferences" />
-      <node concept="2pBcaW" id="x1FXqHS9W" role="hSBgu">
-        <property role="2pBcoG" value="6452540484739589866" />
-        <property role="2pBcow" value="r:0f81d0ca-0757-4ee3-8a9a-ba988c2c39e3(com.mbeddr.formal.safety.gsn.ext.structure)" />
-        <property role="2pBc3U" value="explanation" />
-      </node>
-      <node concept="2pBcaW" id="x1FXqHSa6" role="hSBgs">
-        <property role="2pBcoG" value="9296093161947774" />
-        <property role="2pBcow" value="r:0f81d0ca-0757-4ee3-8a9a-ba988c2c39e3(com.mbeddr.formal.safety.gsn.ext.structure)" />
-        <property role="2pBc3U" value="explanation" />
-      </node>
-    </node>
-  </node>
-  <node concept="Z5qvL" id="x1FXqHSa8">
-    <property role="Z5qvQ" value="0" />
-    <property role="TrG5h" value="Migrate_MoveLinkUp_0" />
-    <property role="1AQGQl" value="Move link `explanation` to concept `AbstractReusableArgumentFragmentsContainer`" />
-    <node concept="Z4OXk" id="x1FXqHSaj" role="Z5rET">
-      <node concept="2pBcaW" id="x1FXqHSah" role="Z5P1v">
-        <property role="2pBcoG" value="6452540484739589866" />
-        <property role="2pBcow" value="r:0f81d0ca-0757-4ee3-8a9a-ba988c2c39e3(com.mbeddr.formal.safety.gsn.ext.structure)" />
-        <property role="2pBc3U" value="explanation_old" />
-      </node>
-      <node concept="2pBcaW" id="x1FXqHSai" role="Z5P1t">
-        <property role="2pBcoG" value="9296093161947774" />
-        <property role="2pBcow" value="r:0f81d0ca-0757-4ee3-8a9a-ba988c2c39e3(com.mbeddr.formal.safety.gsn.ext.structure)" />
-        <property role="2pBc3U" value="explanation" />
-      </node>
-      <node concept="7a1rN" id="x1FXqHSag" role="7agGg">
-        <node concept="HUanS" id="x1FXqHSaa" role="HTpAE">
-          <property role="HUanP" value="explanation_old" />
-          <property role="HUanQ" value="1d0uapcnvnf1m" />
-          <node concept="2x4n5u" id="x1FXqHSab" role="HUanR">
-            <property role="2x4mPI" value="PatternDefinition" />
-            <property role="2x4n5l" value="cdlessfydwln" />
-            <node concept="2V$Bhx" id="x1FXqHSac" role="2x4n5j">
-              <property role="2V$B1T" value="6464626a-ab04-4051-908e-5e8dc75acd78" />
-              <property role="2V$B1Q" value="com.mbeddr.formal.safety.gsn.ext" />
-            </node>
-          </node>
-        </node>
-        <node concept="HUanS" id="x1FXqHSad" role="HTpAD">
-          <property role="HUanP" value="explanation" />
-          <property role="HUanQ" value="2jj6u8qlzsu" />
-          <node concept="2x4n5u" id="x1FXqHSae" role="HUanR">
-            <property role="2x4mPI" value="AbstractReusableArgumentFragmentsContainer" />
-            <property role="2x4n5l" value="2jj6u8qly25" />
-            <node concept="2V$Bhx" id="x1FXqHSaf" role="2x4n5j">
-              <property role="2V$B1T" value="6464626a-ab04-4051-908e-5e8dc75acd78" />
-              <property role="2V$B1Q" value="com.mbeddr.formal.safety.gsn.ext" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="W$Crc" id="x1FXqHSaP">
-    <property role="3GE5qa" value="refactoring" />
-    <property role="W$Cri" value="1" />
-    <property role="TrG5h" value="Update References: documentation-&gt;documentation" />
-    <node concept="1w76tK" id="x1FXqHSaQ" role="1w76sc">
-      <node concept="1w76tN" id="x1FXqHSaR" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.updateLocalInstances" />
-        <property role="1w7ld4" value="Update instances in current project" />
-      </node>
-      <node concept="1w76tN" id="x1FXqHSaS" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.updateModelImports" />
-        <property role="1w7ld4" value="Update model imports" />
-      </node>
-      <node concept="1w76tN" id="x1FXqHSaT" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.updateReferencesParticipant" />
-        <property role="1w7ld4" value="Update references" />
-      </node>
-      <node concept="1w76tN" id="x1FXqHSaU" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.writeMigrationScript" />
-        <property role="1w7ld4" value="Write migration script" />
-      </node>
-      <node concept="1w76tN" id="x1FXqHSaV" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.writeRefactoringLog" />
-        <property role="1w7ld4" value="Write refactoring log" />
-      </node>
-    </node>
-    <node concept="7amoh" id="x1FXqHSaX" role="W$Crh">
-      <property role="hSBgo" value="moveNode.updateReferences" />
-      <node concept="2pBcaW" id="x1FXqHSaM" role="hSBgu">
-        <property role="2pBcoG" value="5931136657905181501" />
-        <property role="2pBcow" value="r:0f81d0ca-0757-4ee3-8a9a-ba988c2c39e3(com.mbeddr.formal.safety.gsn.ext.structure)" />
-        <property role="2pBc3U" value="documentation" />
-      </node>
-      <node concept="2pBcaW" id="x1FXqHSaW" role="hSBgs">
-        <property role="2pBcoG" value="9296093161947828" />
-        <property role="2pBcow" value="r:0f81d0ca-0757-4ee3-8a9a-ba988c2c39e3(com.mbeddr.formal.safety.gsn.ext.structure)" />
-        <property role="2pBc3U" value="documentation" />
-      </node>
-    </node>
-  </node>
-  <node concept="Z5qvL" id="x1FXqHSaY">
-    <property role="Z5qvQ" value="1" />
-    <property role="TrG5h" value="Migrate_MoveLinkUp_1" />
-    <property role="1AQGQl" value="Move link `documentation` to concept `AbstractReusableArgumentFragmentsContainer`" />
-    <node concept="Z4OXk" id="x1FXqHSb9" role="Z5rET">
-      <node concept="2pBcaW" id="x1FXqHSb7" role="Z5P1v">
-        <property role="2pBcoG" value="5931136657905181501" />
-        <property role="2pBcow" value="r:0f81d0ca-0757-4ee3-8a9a-ba988c2c39e3(com.mbeddr.formal.safety.gsn.ext.structure)" />
-        <property role="2pBc3U" value="documentation_old" />
-      </node>
-      <node concept="2pBcaW" id="x1FXqHSb8" role="Z5P1t">
-        <property role="2pBcoG" value="9296093161947828" />
-        <property role="2pBcow" value="r:0f81d0ca-0757-4ee3-8a9a-ba988c2c39e3(com.mbeddr.formal.safety.gsn.ext.structure)" />
-        <property role="2pBc3U" value="documentation" />
-      </node>
-      <node concept="7a1rY" id="x1FXqHSb6" role="7agGg">
-        <node concept="HUanN" id="x1FXqHSb0" role="HTpAy">
-          <property role="HUanK" value="documentation_old" />
-          <property role="HUanL" value="1928ch1cyb8sd" />
-          <node concept="2x4n5u" id="x1FXqHSb1" role="HUanM">
-            <property role="2x4mPI" value="PatternDefinition" />
-            <property role="2x4n5l" value="cdlessfydwln" />
-            <node concept="2V$Bhx" id="x1FXqHSb2" role="2x4n5j">
-              <property role="2V$B1T" value="6464626a-ab04-4051-908e-5e8dc75acd78" />
-              <property role="2V$B1Q" value="com.mbeddr.formal.safety.gsn.ext" />
-            </node>
-          </node>
-        </node>
-        <node concept="HUanN" id="x1FXqHSb3" role="HTpAx">
-          <property role="HUanK" value="documentation" />
-          <property role="HUanL" value="2jj6u8qlzuc" />
-          <node concept="2x4n5u" id="x1FXqHSb4" role="HUanM">
-            <property role="2x4mPI" value="AbstractReusableArgumentFragmentsContainer" />
-            <property role="2x4n5l" value="2jj6u8qly25" />
-            <node concept="2V$Bhx" id="x1FXqHSb5" role="2x4n5j">
-              <property role="2V$B1T" value="6464626a-ab04-4051-908e-5e8dc75acd78" />
-              <property role="2V$B1Q" value="com.mbeddr.formal.safety.gsn.ext" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
+  <registry />
 </model>
 
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.structure.mps
index 1b9a23aee..59afe21e2 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.structure.mps
@@ -31,9 +31,6 @@
       </concept>
     </language>
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
-      <concept id="1224240836180" name="jetbrains.mps.lang.structure.structure.DeprecatedNodeAnnotation" flags="ig" index="asaX9">
-        <property id="1225118933224" name="comment" index="YLQ7P" />
-      </concept>
       <concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
         <property id="6714410169261853888" name="conceptId" index="EcuMT" />
         <property id="4628067390765907488" name="conceptShortDescription" index="R4oN_" />
@@ -70,7 +67,6 @@
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
@@ -98,23 +94,6 @@
         </node>
       </node>
     </node>
-    <node concept="1TJgyj" id="5Ac1Q93IIrE" role="1TKVEi">
-      <property role="IQ2ns" value="6452540484739589866" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="explanation_old" />
-      <ref role="20lvS9" to="87nw:2dWzqxEB$Tx" resolve="Text" />
-      <node concept="asaX9" id="x1FXqHSa9" role="lGtFl">
-        <property role="YLQ7P" value="The link was moved to concept &quot;com.mbeddr.formal.safety.gsn.ext.structure.AbstractReusableArgumentFragmentsContainer&quot;" />
-      </node>
-    </node>
-    <node concept="1TJgyj" id="59fClQCJ6cX" role="1TKVEi">
-      <property role="IQ2ns" value="5931136657905181501" />
-      <property role="20kJfa" value="documentation_old" />
-      <ref role="20lvS9" node="2xfNjApoY99" resolve="IGSNDocument" />
-      <node concept="asaX9" id="x1FXqHSaZ" role="lGtFl">
-        <property role="YLQ7P" value="The link was moved to concept &quot;com.mbeddr.formal.safety.gsn.ext.structure.AbstractReusableArgumentFragmentsContainer&quot;" />
-      </node>
-    </node>
     <node concept="PrWs8" id="4bL3rTRC37l" role="PzmwI">
       <ref role="PrY4T" to="b19z:3QMOguhhcvK" resolve="IContainerForEntitiesWithPrefixedNames" />
     </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.behavior.mps
index 373612aa1..aed7a3a91 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.behavior.mps
@@ -456,27 +456,5 @@
       <node concept="3clFbS" id="5P9zxa4gbjL" role="2VODD2" />
     </node>
   </node>
-  <node concept="13h7C7" id="ZaBFheHmaT">
-    <ref role="13h7C2" to="bsp8:4i__4Gxs2uL" resolve="ComponentInterfaceRef" />
-    <node concept="13hLZK" id="ZaBFheHmaU" role="13h7CW">
-      <node concept="3clFbS" id="ZaBFheHmaV" role="2VODD2" />
-    </node>
-    <node concept="13i0hz" id="ZaBFheHmb4" role="13h7CS">
-      <property role="TrG5h" value="getComponent" />
-      <ref role="13i0hy" to="g8ih:ZaBFheHm9F" resolve="getComponent" />
-      <node concept="3Tm1VV" id="ZaBFheHmb5" role="1B3o_S" />
-      <node concept="3clFbS" id="ZaBFheHmb8" role="3clF47">
-        <node concept="3clFbF" id="ZaBFheHmWS" role="3cqZAp">
-          <node concept="2OqwBi" id="ZaBFheHn5N" role="3clFbG">
-            <node concept="13iPFW" id="ZaBFheHmWR" role="2Oq$k0" />
-            <node concept="3TrEf2" id="ZaBFheHngv" role="2OqNvi">
-              <ref role="3Tt5mk" to="bsp8:4i__4Gxs2vk" resolve="componentInterface" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tqbb2" id="ZaBFheHmb9" role="3clF45" />
-    </node>
-  </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.editor.mps
index 0c6f84a52..cbff00bd4 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.editor.mps
@@ -236,18 +236,6 @@
       <node concept="2iRfu4" id="5r2fDr4oXpt" role="2iSdaV" />
     </node>
   </node>
-  <node concept="24kQdi" id="4i__4Gxs2vn">
-    <ref role="1XX52x" to="bsp8:4i__4Gxs2uL" resolve="ComponentInterfaceRef" />
-    <node concept="1iCGBv" id="4i__4Gxs2vp" role="2wV5jI">
-      <ref role="1NtTu8" to="bsp8:4i__4Gxs2vk" resolve="componentInterface" />
-      <node concept="1sVBvm" id="4i__4Gxs2vr" role="1sWHZn">
-        <node concept="3F0A7n" id="4i__4Gxs2v_" role="2wV5jI">
-          <property role="1Intyy" value="true" />
-          <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="PKFIW" id="3Ngc4zVfNmk">
     <property role="3GE5qa" value="gsn.dsl.smv.spec" />
     <property role="TrG5h" value="SmvSpecGoalTextArea" />
@@ -919,9 +907,5 @@
       </node>
     </node>
   </node>
-  <node concept="22mcaB" id="4MR8i$4iWiq">
-    <ref role="aqKnT" to="bsp8:4i__4Gxs2uL" resolve="ComponentInterfaceRef" />
-    <node concept="22hDWj" id="7KmK1hXsUxm" role="22hAXT" />
-  </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.migration.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.migration.mps
index 5392b7553..08565ce6e 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.migration.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.migration.mps
@@ -14,970 +14,7 @@
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="slm6" ref="90746344-04fd-4286-97d5-b46ae6a81709/r:52a3d974-bd4f-4651-ba6e-a2de5e336d95(jetbrains.mps.lang.migration/jetbrains.mps.lang.migration.methods)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
-    <import index="2qxf" ref="r:92bf1daa-4510-4ff1-a9b1-c695f68c3f1d(com.mbeddr.formal.safety.gsn.patterns.structure)" implicit="true" />
-    <import index="bsp8" ref="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" implicit="true" />
   </imports>
-  <registry>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
-      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
-      <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
-        <child id="1154032183016" name="body" index="2LFqv$" />
-      </concept>
-      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
-        <child id="1197027771414" name="operand" index="2Oq$k0" />
-        <child id="1197027833540" name="operation" index="2OqNvi" />
-      </concept>
-      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
-      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
-        <child id="1165602531693" name="superclass" index="1zkMxy" />
-      </concept>
-      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
-        <child id="1068431790190" name="initializer" index="33vP2m" />
-      </concept>
-      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
-        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
-      </concept>
-      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
-        <child id="5680397130376446158" name="type" index="1tU5fm" />
-      </concept>
-      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
-        <child id="1068580123133" name="returnType" index="3clF45" />
-        <child id="1068580123134" name="parameter" index="3clF46" />
-        <child id="1068580123135" name="body" index="3clF47" />
-      </concept>
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </concept>
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
-        <child id="1068581517665" name="statement" index="3cqZAp" />
-      </concept>
-      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
-        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
-      </concept>
-      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
-        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
-      </concept>
-      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
-        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
-      </concept>
-      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
-      </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
-        <child id="1178549979242" name="visibility" index="1B3o_S" />
-      </concept>
-      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
-    </language>
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl">
-      <concept id="8880393040217246788" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodParameterInstance" flags="ig" index="ffn8J">
-        <reference id="8880393040217294897" name="decl" index="ffrpq" />
-      </concept>
-      <concept id="3751132065236767083" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.DependentTypeInstance" flags="ig" index="q3mfm">
-        <reference id="3751132065236767084" name="decl" index="q3mfh" />
-        <reference id="9097849371505568270" name="point" index="1QQUv3" />
-      </concept>
-      <concept id="3751132065236767060" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodInstance" flags="ig" index="q3mfD">
-        <reference id="19209059688387895" name="decl" index="2VtyIY" />
-      </concept>
-      <concept id="6478870542308708689" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.PropertyInstance" flags="ig" index="3tT0cZ">
-        <reference id="8585153554445465961" name="decl" index="25KYV2" />
-      </concept>
-      <concept id="6478870542308703666" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MemberPlaceholder" flags="ng" index="3tTeZs">
-        <property id="6478870542308703667" name="caption" index="3tTeZt" />
-        <reference id="6478870542308703669" name="decl" index="3tTeZr" />
-      </concept>
-      <concept id="6478870542308871875" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.BooleanPropertyInstance" flags="ig" index="3tYpMH">
-        <property id="6478870542308871876" name="value" index="3tYpME" />
-      </concept>
-    </language>
-    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
-      <concept id="5455284157994012186" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitLink" flags="ng" index="2pIpSj">
-        <reference id="5455284157994012188" name="link" index="2pIpSl" />
-        <child id="1595412875168045827" name="initValue" index="28nt2d" />
-      </concept>
-      <concept id="5455284157993863837" name="jetbrains.mps.lang.quotation.structure.NodeBuilder" flags="nn" index="2pJPEk">
-        <child id="5455284157993863838" name="quotedNode" index="2pJPEn" />
-      </concept>
-      <concept id="5455284157993863840" name="jetbrains.mps.lang.quotation.structure.NodeBuilderNode" flags="nn" index="2pJPED">
-        <reference id="5455284157993910961" name="concept" index="2pJxaS" />
-        <child id="5455284157993911099" name="values" index="2pJxcM" />
-      </concept>
-      <concept id="8182547171709752110" name="jetbrains.mps.lang.quotation.structure.NodeBuilderExpression" flags="nn" index="36biLy">
-        <child id="8182547171709752112" name="expression" index="36biLW" />
-      </concept>
-    </language>
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
-        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
-      </concept>
-      <concept id="6911370362349121511" name="jetbrains.mps.lang.smodel.structure.ConceptId" flags="nn" index="2x4n5u">
-        <property id="6911370362349122519" name="conceptName" index="2x4mPI" />
-        <property id="6911370362349121516" name="conceptId" index="2x4n5l" />
-        <property id="6911370362349133804" name="isInterface" index="2x4o5l" />
-        <child id="6911370362349121514" name="languageIdentity" index="2x4n5j" />
-      </concept>
-      <concept id="6911370362349167452" name="jetbrains.mps.lang.smodel.structure.PropertyId" flags="ng" index="2x5zR_">
-        <property id="6911370362349167457" name="propertyId" index="2x5zRo" />
-        <property id="6911370362349167455" name="propertyName" index="2x5zRA" />
-        <child id="6911370362349167460" name="conceptIdentity" index="2x5zRt" />
-      </concept>
-      <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
-      <concept id="1171323947159" name="jetbrains.mps.lang.smodel.structure.Model_NodesOperation" flags="nn" index="2SmgA7">
-        <child id="1758937410080001570" name="conceptArgument" index="1dBWTz" />
-      </concept>
-      <concept id="3542851458883438784" name="jetbrains.mps.lang.smodel.structure.LanguageId" flags="nn" index="2V$Bhx">
-        <property id="3542851458883439831" name="namespace" index="2V$B1Q" />
-        <property id="3542851458883439832" name="languageId" index="2V$B1T" />
-      </concept>
-      <concept id="1140131837776" name="jetbrains.mps.lang.smodel.structure.Node_ReplaceWithAnotherOperation" flags="nn" index="1P9Npp">
-        <child id="1140131861877" name="replacementNode" index="1P9ThW" />
-      </concept>
-      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
-        <reference id="1138056516764" name="link" index="3Tt5mk" />
-      </concept>
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
-        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
-      </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-    <language id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration">
-      <concept id="3116305438947623353" name="jetbrains.mps.lang.migration.structure.MoveProperty" flags="ng" index="7a1rK">
-        <child id="8415841354033040058" name="targetId" index="HTpA_" />
-        <child id="8415841354033040057" name="sourceId" index="HTpAA" />
-      </concept>
-      <concept id="3116305438947553624" name="jetbrains.mps.lang.migration.structure.RefactoringPart" flags="ng" index="7amoh">
-        <property id="3628660716136424362" name="participant" index="hSBgo" />
-        <child id="3628660716136424366" name="finalState" index="hSBgs" />
-        <child id="3628660716136424364" name="initialState" index="hSBgu" />
-      </concept>
-      <concept id="2864063292004102367" name="jetbrains.mps.lang.migration.structure.ReflectionNodeReference" flags="ng" index="2pBcaW">
-        <property id="2864063292004102809" name="nodeName" index="2pBc3U" />
-        <property id="2864063292004103235" name="modelRef" index="2pBcow" />
-        <property id="2864063292004103247" name="nodeId" index="2pBcoG" />
-      </concept>
-      <concept id="2015900981881695631" name="jetbrains.mps.lang.migration.structure.RefactoringLog" flags="ng" index="W$Crc">
-        <property id="2015900981881695633" name="fromVersion" index="W$Cri" />
-        <child id="2015900981881695634" name="part" index="W$Crh" />
-        <child id="3597905718825595708" name="options" index="1w76sc" />
-      </concept>
-      <concept id="7431903976166007326" name="jetbrains.mps.lang.migration.structure.MoveNodeMigrationPart" flags="ng" index="Z4OXk">
-        <child id="3116305438947564633" name="specialization" index="7agGg" />
-        <child id="7431903976166276375" name="toNode" index="Z5P1t" />
-        <child id="7431903976166276373" name="fromNode" index="Z5P1v" />
-      </concept>
-      <concept id="7431903976166443707" name="jetbrains.mps.lang.migration.structure.PureMigrationScript" flags="ng" index="Z5qvL">
-        <property id="7431903976166443708" name="fromVersion" index="Z5qvQ" />
-        <child id="7431903976166447091" name="part" index="Z5rET" />
-      </concept>
-      <concept id="3597905718825595712" name="jetbrains.mps.lang.migration.structure.RefactoringOptions" flags="ng" index="1w76tK">
-        <child id="3597905718825595718" name="options" index="1w76tQ" />
-      </concept>
-      <concept id="3597905718825595715" name="jetbrains.mps.lang.migration.structure.RefactoringOption" flags="ng" index="1w76tN">
-        <property id="3597905718825595716" name="optionId" index="1w76tO" />
-        <property id="3597905718825650036" name="description" index="1w7ld4" />
-      </concept>
-      <concept id="8352104482584315555" name="jetbrains.mps.lang.migration.structure.MigrationScript" flags="ig" index="3SyAh_">
-        <property id="5820409521797704727" name="fromVersion" index="qMTe8" />
-      </concept>
-    </language>
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
-      <concept id="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
-        <child id="1153944400369" name="variable" index="2Gsz3X" />
-        <child id="1153944424730" name="inputSequence" index="2GsD0m" />
-      </concept>
-      <concept id="1153944193378" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariable" flags="nr" index="2GrKxI" />
-      <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
-        <reference id="1153944258490" name="variable" index="2Gs0qQ" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="W$Crc" id="4i__4GxsrcT">
-    <property role="3GE5qa" value="refactoring" />
-    <property role="W$Cri" value="0" />
-    <property role="TrG5h" value="Update References: hashCode-&gt;hashCode" />
-    <node concept="1w76tK" id="4i__4GxsrcU" role="1w76sc">
-      <node concept="1w76tN" id="4i__4GxsrcV" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.updateLocalInstances" />
-        <property role="1w7ld4" value="Update instances in current project" />
-      </node>
-      <node concept="1w76tN" id="4i__4GxsrcW" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.updateModelImports" />
-        <property role="1w7ld4" value="Update model imports" />
-      </node>
-      <node concept="1w76tN" id="4i__4GxsrcX" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.updateReferencesParticipant" />
-        <property role="1w7ld4" value="Update references" />
-      </node>
-      <node concept="1w76tN" id="4i__4GxsrcY" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.writeMigrationScript" />
-        <property role="1w7ld4" value="Write migration script" />
-      </node>
-      <node concept="1w76tN" id="4i__4GxsrcZ" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.writeRefactoringLog" />
-        <property role="1w7ld4" value="Write refactoring log" />
-      </node>
-    </node>
-    <node concept="7amoh" id="4i__4Gxsrd1" role="W$Crh">
-      <property role="hSBgo" value="moveNode.updateReferences" />
-      <node concept="2pBcaW" id="4i__4GxsrcQ" role="hSBgu">
-        <property role="2pBcoG" value="6963850566126458057" />
-        <property role="2pBcow" value="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" />
-        <property role="2pBc3U" value="hashCode" />
-      </node>
-      <node concept="2pBcaW" id="4i__4Gxsrd0" role="hSBgs">
-        <property role="2pBcoG" value="4946522816140915512" />
-        <property role="2pBcow" value="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" />
-        <property role="2pBc3U" value="hashCode" />
-      </node>
-    </node>
-  </node>
-  <node concept="Z5qvL" id="4i__4Gxsrd2">
-    <property role="Z5qvQ" value="0" />
-    <property role="TrG5h" value="Migrate_MovePropertyUp_0" />
-    <node concept="Z4OXk" id="4i__4Gxsrdd" role="Z5rET">
-      <node concept="2pBcaW" id="4i__4Gxsrdb" role="Z5P1v">
-        <property role="2pBcoG" value="6963850566126458057" />
-        <property role="2pBcow" value="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" />
-        <property role="2pBc3U" value="hashCode_old" />
-      </node>
-      <node concept="2pBcaW" id="4i__4Gxsrdc" role="Z5P1t">
-        <property role="2pBcoG" value="4946522816140915512" />
-        <property role="2pBcow" value="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" />
-        <property role="2pBc3U" value="hashCode" />
-      </node>
-      <node concept="7a1rK" id="4i__4Gxsrda" role="7agGg">
-        <node concept="2x5zR_" id="4i__4Gxsrd4" role="HTpAA">
-          <property role="2x5zRA" value="hashCode" />
-          <property role="2x5zRo" value="1gwov01bmb2rt" />
-          <node concept="2x4n5u" id="4i__4Gxsrd5" role="2x5zRt">
-            <property role="2x4mPI" value="SmvSpecSolution" />
-            <property role="2x4n5l" value="lq0m5i9tid2" />
-            <node concept="2V$Bhx" id="4i__4Gxsrd6" role="2x4n5j">
-              <property role="2V$B1T" value="7f3eac5a-7f9a-4fbe-8264-f69c70ece985" />
-              <property role="2V$B1Q" value="com.mbeddr.formal.safety.gsn.smv" />
-            </node>
-          </node>
-        </node>
-        <node concept="2x5zR_" id="4i__4Gxsrd7" role="HTpA_">
-          <property role="2x5zRA" value="hashCode" />
-          <property role="2x5zRo" value="11kxfzuvjwojc" />
-          <node concept="2x4n5u" id="4i__4Gxsrd8" role="2x5zRt">
-            <property role="2x4mPI" value="SmvResultsSolutionBase" />
-            <property role="2x4n5l" value="11kxfzuvjwml4" />
-            <node concept="2V$Bhx" id="4i__4Gxsrd9" role="2x4n5j">
-              <property role="2V$B1T" value="7f3eac5a-7f9a-4fbe-8264-f69c70ece985" />
-              <property role="2V$B1Q" value="com.mbeddr.formal.safety.gsn.smv" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="W$Crc" id="4i__4GxssK2">
-    <property role="3GE5qa" value="refactoring" />
-    <property role="W$Cri" value="1" />
-    <property role="TrG5h" value="Update References: success-&gt;success" />
-    <node concept="1w76tK" id="4i__4GxssK3" role="1w76sc">
-      <node concept="1w76tN" id="4i__4GxssK4" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.updateLocalInstances" />
-        <property role="1w7ld4" value="Update instances in current project" />
-      </node>
-      <node concept="1w76tN" id="4i__4GxssK5" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.updateModelImports" />
-        <property role="1w7ld4" value="Update model imports" />
-      </node>
-      <node concept="1w76tN" id="4i__4GxssK6" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.updateReferencesParticipant" />
-        <property role="1w7ld4" value="Update references" />
-      </node>
-      <node concept="1w76tN" id="4i__4GxssK7" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.writeMigrationScript" />
-        <property role="1w7ld4" value="Write migration script" />
-      </node>
-      <node concept="1w76tN" id="4i__4GxssK8" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.writeRefactoringLog" />
-        <property role="1w7ld4" value="Write refactoring log" />
-      </node>
-    </node>
-    <node concept="7amoh" id="4i__4GxssKa" role="W$Crh">
-      <property role="hSBgo" value="moveNode.updateReferences" />
-      <node concept="2pBcaW" id="4i__4GxssJZ" role="hSBgu">
-        <property role="2pBcoG" value="79421622115107641" />
-        <property role="2pBcow" value="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" />
-        <property role="2pBc3U" value="success" />
-      </node>
-      <node concept="2pBcaW" id="4i__4GxssK9" role="hSBgs">
-        <property role="2pBcoG" value="4946522816140921857" />
-        <property role="2pBcow" value="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" />
-        <property role="2pBc3U" value="success" />
-      </node>
-    </node>
-  </node>
-  <node concept="Z5qvL" id="4i__4GxssKb">
-    <property role="Z5qvQ" value="1" />
-    <property role="TrG5h" value="Migrate_MovePropertyUp_1" />
-    <node concept="Z4OXk" id="4i__4GxssKm" role="Z5rET">
-      <node concept="2pBcaW" id="4i__4GxssKk" role="Z5P1v">
-        <property role="2pBcoG" value="79421622115107641" />
-        <property role="2pBcow" value="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" />
-        <property role="2pBc3U" value="success_old" />
-      </node>
-      <node concept="2pBcaW" id="4i__4GxssKl" role="Z5P1t">
-        <property role="2pBcoG" value="4946522816140921857" />
-        <property role="2pBcow" value="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" />
-        <property role="2pBc3U" value="success" />
-      </node>
-      <node concept="7a1rK" id="4i__4GxssKj" role="7agGg">
-        <node concept="2x5zR_" id="4i__4GxssKd" role="HTpAA">
-          <property role="2x5zRA" value="success" />
-          <property role="2x5zRo" value="lq0m5i9tid5" />
-          <node concept="2x4n5u" id="4i__4GxssKe" role="2x5zRt">
-            <property role="2x4mPI" value="SmvSpecSolution" />
-            <property role="2x4n5l" value="lq0m5i9tid2" />
-            <node concept="2V$Bhx" id="4i__4GxssKf" role="2x4n5j">
-              <property role="2V$B1T" value="7f3eac5a-7f9a-4fbe-8264-f69c70ece985" />
-              <property role="2V$B1Q" value="com.mbeddr.formal.safety.gsn.smv" />
-            </node>
-          </node>
-        </node>
-        <node concept="2x5zR_" id="4i__4GxssKg" role="HTpA_">
-          <property role="2x5zRA" value="success" />
-          <property role="2x5zRo" value="11kxfzuvjwtfl" />
-          <node concept="2x4n5u" id="4i__4GxssKh" role="2x5zRt">
-            <property role="2x4mPI" value="SmvResultsSolutionBase" />
-            <property role="2x4n5l" value="11kxfzuvjwml4" />
-            <node concept="2V$Bhx" id="4i__4GxssKi" role="2x4n5j">
-              <property role="2V$B1T" value="7f3eac5a-7f9a-4fbe-8264-f69c70ece985" />
-              <property role="2V$B1Q" value="com.mbeddr.formal.safety.gsn.smv" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="W$Crc" id="4i__4GxssL$">
-    <property role="3GE5qa" value="refactoring" />
-    <property role="W$Cri" value="2" />
-    <property role="TrG5h" value="Update References: dateShort-&gt;dateShort" />
-    <node concept="1w76tK" id="4i__4GxssL_" role="1w76sc">
-      <node concept="1w76tN" id="4i__4GxssLA" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.updateLocalInstances" />
-        <property role="1w7ld4" value="Update instances in current project" />
-      </node>
-      <node concept="1w76tN" id="4i__4GxssLB" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.updateModelImports" />
-        <property role="1w7ld4" value="Update model imports" />
-      </node>
-      <node concept="1w76tN" id="4i__4GxssLC" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.updateReferencesParticipant" />
-        <property role="1w7ld4" value="Update references" />
-      </node>
-      <node concept="1w76tN" id="4i__4GxssLD" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.writeMigrationScript" />
-        <property role="1w7ld4" value="Write migration script" />
-      </node>
-      <node concept="1w76tN" id="4i__4GxssLE" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.writeRefactoringLog" />
-        <property role="1w7ld4" value="Write refactoring log" />
-      </node>
-    </node>
-    <node concept="7amoh" id="4i__4GxssLG" role="W$Crh">
-      <property role="hSBgo" value="moveNode.updateReferences" />
-      <node concept="2pBcaW" id="4i__4GxssLx" role="hSBgu">
-        <property role="2pBcoG" value="79421622118163395" />
-        <property role="2pBcow" value="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" />
-        <property role="2pBc3U" value="dateShort" />
-      </node>
-      <node concept="2pBcaW" id="4i__4GxssLF" role="hSBgs">
-        <property role="2pBcoG" value="4946522816140921955" />
-        <property role="2pBcow" value="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" />
-        <property role="2pBc3U" value="dateShort" />
-      </node>
-    </node>
-  </node>
-  <node concept="Z5qvL" id="4i__4GxssLH">
-    <property role="Z5qvQ" value="2" />
-    <property role="TrG5h" value="Migrate_MovePropertyUp_2" />
-    <node concept="Z4OXk" id="4i__4GxssLS" role="Z5rET">
-      <node concept="2pBcaW" id="4i__4GxssLQ" role="Z5P1v">
-        <property role="2pBcoG" value="79421622118163395" />
-        <property role="2pBcow" value="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" />
-        <property role="2pBc3U" value="dateShort_old" />
-      </node>
-      <node concept="2pBcaW" id="4i__4GxssLR" role="Z5P1t">
-        <property role="2pBcoG" value="4946522816140921955" />
-        <property role="2pBcow" value="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" />
-        <property role="2pBc3U" value="dateShort" />
-      </node>
-      <node concept="7a1rK" id="4i__4GxssLP" role="7agGg">
-        <node concept="2x5zR_" id="4i__4GxssLJ" role="HTpAA">
-          <property role="2x5zRA" value="dateShort" />
-          <property role="2x5zRo" value="lq0m5ibn077" />
-          <node concept="2x4n5u" id="4i__4GxssLK" role="2x5zRt">
-            <property role="2x4mPI" value="SmvSpecSolution" />
-            <property role="2x4n5l" value="lq0m5i9tid2" />
-            <node concept="2V$Bhx" id="4i__4GxssLL" role="2x4n5j">
-              <property role="2V$B1T" value="7f3eac5a-7f9a-4fbe-8264-f69c70ece985" />
-              <property role="2V$B1Q" value="com.mbeddr.formal.safety.gsn.smv" />
-            </node>
-          </node>
-        </node>
-        <node concept="2x5zR_" id="4i__4GxssLM" role="HTpA_">
-          <property role="2x5zRA" value="dateShort" />
-          <property role="2x5zRo" value="11kxfzuvjwtib" />
-          <node concept="2x4n5u" id="4i__4GxssLN" role="2x5zRt">
-            <property role="2x4mPI" value="SmvResultsSolutionBase" />
-            <property role="2x4n5l" value="11kxfzuvjwml4" />
-            <node concept="2V$Bhx" id="4i__4GxssLO" role="2x4n5j">
-              <property role="2V$B1T" value="7f3eac5a-7f9a-4fbe-8264-f69c70ece985" />
-              <property role="2V$B1Q" value="com.mbeddr.formal.safety.gsn.smv" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="W$Crc" id="4i__4GxssN8">
-    <property role="3GE5qa" value="refactoring" />
-    <property role="W$Cri" value="3" />
-    <property role="TrG5h" value="Update References: dateLong-&gt;dateLong" />
-    <node concept="1w76tK" id="4i__4GxssN9" role="1w76sc">
-      <node concept="1w76tN" id="4i__4GxssNa" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.updateLocalInstances" />
-        <property role="1w7ld4" value="Update instances in current project" />
-      </node>
-      <node concept="1w76tN" id="4i__4GxssNb" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.updateModelImports" />
-        <property role="1w7ld4" value="Update model imports" />
-      </node>
-      <node concept="1w76tN" id="4i__4GxssNc" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.updateReferencesParticipant" />
-        <property role="1w7ld4" value="Update references" />
-      </node>
-      <node concept="1w76tN" id="4i__4GxssNd" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.writeMigrationScript" />
-        <property role="1w7ld4" value="Write migration script" />
-      </node>
-      <node concept="1w76tN" id="4i__4GxssNe" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.writeRefactoringLog" />
-        <property role="1w7ld4" value="Write refactoring log" />
-      </node>
-    </node>
-    <node concept="7amoh" id="4i__4GxssNg" role="W$Crh">
-      <property role="hSBgo" value="moveNode.updateReferences" />
-      <node concept="2pBcaW" id="4i__4GxssN5" role="hSBgu">
-        <property role="2pBcoG" value="79421622115107639" />
-        <property role="2pBcow" value="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" />
-        <property role="2pBc3U" value="dateLong" />
-      </node>
-      <node concept="2pBcaW" id="4i__4GxssNf" role="hSBgs">
-        <property role="2pBcoG" value="4946522816140922055" />
-        <property role="2pBcow" value="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" />
-        <property role="2pBc3U" value="dateLong" />
-      </node>
-    </node>
-  </node>
-  <node concept="Z5qvL" id="4i__4GxssNh">
-    <property role="Z5qvQ" value="3" />
-    <property role="TrG5h" value="Migrate_MovePropertyUp_3" />
-    <node concept="Z4OXk" id="4i__4GxssNs" role="Z5rET">
-      <node concept="2pBcaW" id="4i__4GxssNq" role="Z5P1v">
-        <property role="2pBcoG" value="79421622115107639" />
-        <property role="2pBcow" value="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" />
-        <property role="2pBc3U" value="dateLong_old" />
-      </node>
-      <node concept="2pBcaW" id="4i__4GxssNr" role="Z5P1t">
-        <property role="2pBcoG" value="4946522816140922055" />
-        <property role="2pBcow" value="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" />
-        <property role="2pBc3U" value="dateLong" />
-      </node>
-      <node concept="7a1rK" id="4i__4GxssNp" role="7agGg">
-        <node concept="2x5zR_" id="4i__4GxssNj" role="HTpAA">
-          <property role="2x5zRA" value="dateLong" />
-          <property role="2x5zRo" value="lq0m5i9tid3" />
-          <node concept="2x4n5u" id="4i__4GxssNk" role="2x5zRt">
-            <property role="2x4mPI" value="SmvSpecSolution" />
-            <property role="2x4n5l" value="lq0m5i9tid2" />
-            <node concept="2V$Bhx" id="4i__4GxssNl" role="2x4n5j">
-              <property role="2V$B1T" value="7f3eac5a-7f9a-4fbe-8264-f69c70ece985" />
-              <property role="2V$B1Q" value="com.mbeddr.formal.safety.gsn.smv" />
-            </node>
-          </node>
-        </node>
-        <node concept="2x5zR_" id="4i__4GxssNm" role="HTpA_">
-          <property role="2x5zRA" value="dateLong" />
-          <property role="2x5zRo" value="11kxfzuvjwtl3" />
-          <node concept="2x4n5u" id="4i__4GxssNn" role="2x5zRt">
-            <property role="2x4mPI" value="SmvResultsSolutionBase" />
-            <property role="2x4n5l" value="11kxfzuvjwml4" />
-            <node concept="2V$Bhx" id="4i__4GxssNo" role="2x4n5j">
-              <property role="2V$B1T" value="7f3eac5a-7f9a-4fbe-8264-f69c70ece985" />
-              <property role="2V$B1Q" value="com.mbeddr.formal.safety.gsn.smv" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="3SyAh_" id="3mI4G9o4$t0">
-    <property role="qMTe8" value="4" />
-    <property role="TrG5h" value="updateComponentInterfaceRef" />
-    <node concept="3Tm1VV" id="3mI4G9o4$t1" role="1B3o_S" />
-    <node concept="3tTeZs" id="3mI4G9o4$t2" role="jymVt">
-      <property role="3tTeZt" value="&lt;no execute after&gt;" />
-      <ref role="3tTeZr" to="slm6:7ay_HjIMt1a" resolve="execute after" />
-    </node>
-    <node concept="3tTeZs" id="3mI4G9o4$t3" role="jymVt">
-      <property role="3tTeZt" value="&lt;no required data&gt;" />
-      <ref role="3tTeZr" to="slm6:5TUCQr2FPTh" resolve="requires annotation data" />
-    </node>
-    <node concept="3tTeZs" id="3mI4G9o4$t4" role="jymVt">
-      <property role="3tTeZt" value="&lt;no produced data&gt;" />
-      <ref role="3tTeZr" to="slm6:5TUCQr2C271" resolve="produces annotation data" />
-    </node>
-    <node concept="2tJIrI" id="3mI4G9o4$t5" role="jymVt" />
-    <node concept="3tYpMH" id="3mI4G9o4$t6" role="jymVt">
-      <property role="TrG5h" value="isRerunnable" />
-      <property role="3tYpME" value="true" />
-      <ref role="25KYV2" to="slm6:1JWcQ2VeWIs" resolve="isRerunnable" />
-      <node concept="3Tm1VV" id="3mI4G9o4$t7" role="1B3o_S" />
-      <node concept="10P_77" id="3mI4G9o4$t8" role="1tU5fm" />
-    </node>
-    <node concept="3tTeZs" id="3mI4G9o4$t9" role="jymVt">
-      <property role="3tTeZt" value="&lt;description&gt;" />
-      <ref role="3tTeZr" to="slm6:1_lSsE3RFpE" resolve="description" />
-    </node>
-    <node concept="q3mfD" id="3mI4G9o4$ta" role="jymVt">
-      <property role="TrG5h" value="execute" />
-      <ref role="2VtyIY" to="slm6:4ubqdNOF9cA" resolve="execute" />
-      <node concept="3Tm1VV" id="3mI4G9o4$tc" role="1B3o_S" />
-      <node concept="3clFbS" id="3mI4G9o4$te" role="3clF47">
-        <node concept="2Gpval" id="3mI4G9o4_$F" role="3cqZAp">
-          <node concept="2GrKxI" id="3mI4G9o4_$K" role="2Gsz3X">
-            <property role="TrG5h" value="crtModel" />
-          </node>
-          <node concept="3clFbS" id="3mI4G9o4_$U" role="2LFqv$">
-            <node concept="3cpWs8" id="3mI4G9o4_MY" role="3cqZAp">
-              <node concept="3cpWsn" id="3mI4G9o4_N1" role="3cpWs9">
-                <property role="TrG5h" value="_m" />
-                <node concept="H_c77" id="3mI4G9o4_MX" role="1tU5fm" />
-                <node concept="2GrUjf" id="3mI4G9o4_Qh" role="33vP2m">
-                  <ref role="2Gs0qQ" node="3mI4G9o4_$K" resolve="crtModel" />
-                </node>
-              </node>
-            </node>
-            <node concept="2Gpval" id="3mI4G9o4ATD" role="3cqZAp">
-              <node concept="2GrKxI" id="3mI4G9o4ATJ" role="2Gsz3X">
-                <property role="TrG5h" value="cir" />
-              </node>
-              <node concept="3clFbS" id="3mI4G9o4ATV" role="2LFqv$">
-                <node concept="3clFbF" id="3mI4G9o4AZz" role="3cqZAp">
-                  <node concept="2OqwBi" id="3mI4G9o4B8$" role="3clFbG">
-                    <node concept="2GrUjf" id="3mI4G9o4AZy" role="2Oq$k0">
-                      <ref role="2Gs0qQ" node="3mI4G9o4ATJ" resolve="cir" />
-                    </node>
-                    <node concept="1P9Npp" id="3mI4G9o4BpE" role="2OqNvi">
-                      <node concept="2pJPEk" id="3mI4G9o4Bsd" role="1P9ThW">
-                        <node concept="2pJPED" id="3mI4G9o4Buj" role="2pJPEn">
-                          <ref role="2pJxaS" to="2qxf:4MR8i$4iWir" resolve="ComponentInterfaceRef" />
-                          <node concept="2pIpSj" id="3mI4G9o4ByL" role="2pJxcM">
-                            <ref role="2pIpSl" to="2qxf:4MR8i$4iWis" resolve="componentInterface" />
-                            <node concept="36biLy" id="3mI4G9o4B_t" role="28nt2d">
-                              <node concept="2OqwBi" id="3mI4G9o4BMU" role="36biLW">
-                                <node concept="2GrUjf" id="3mI4G9o4BBW" role="2Oq$k0">
-                                  <ref role="2Gs0qQ" node="3mI4G9o4ATJ" resolve="cir" />
-                                </node>
-                                <node concept="3TrEf2" id="3mI4G9o4C4S" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="bsp8:4i__4Gxs2vk" resolve="componentInterface" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="2OqwBi" id="3mI4G9o4Agg" role="2GsD0m">
-                <node concept="37vLTw" id="3mI4G9o4A8U" role="2Oq$k0">
-                  <ref role="3cqZAo" node="3mI4G9o4_N1" resolve="_m" />
-                </node>
-                <node concept="2SmgA7" id="3mI4G9o4AnP" role="2OqNvi">
-                  <node concept="chp4Y" id="3mI4G9o4AyX" role="1dBWTz">
-                    <ref role="cht4Q" to="bsp8:4i__4Gxs2uL" resolve="ComponentInterfaceRef" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2OqwBi" id="3mI4G9o4$DC" role="2GsD0m">
-            <node concept="37vLTw" id="3mI4G9o4$zZ" role="2Oq$k0">
-              <ref role="3cqZAo" node="3mI4G9o4$tg" resolve="m" />
-            </node>
-            <node concept="liA8E" id="3mI4G9o4_sY" role="2OqNvi">
-              <ref role="37wK5l" to="lui2:~SModule.getModels()" resolve="getModels" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="ffn8J" id="3mI4G9o4$tg" role="3clF46">
-        <property role="TrG5h" value="m" />
-        <ref role="ffrpq" to="slm6:7fCCGqboj9J" resolve="m" />
-        <node concept="3uibUv" id="3mI4G9o4$tf" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
-        </node>
-      </node>
-      <node concept="q3mfm" id="3mI4G9o4$th" role="3clF45">
-        <ref role="q3mfh" to="slm6:4F5w8gPXEEe" />
-        <ref role="1QQUv3" node="3mI4G9o4$ta" resolve="execute" />
-      </node>
-    </node>
-    <node concept="3tTeZs" id="3mI4G9o4$ti" role="jymVt">
-      <property role="3tTeZt" value="&lt;no result checking&gt;" />
-      <ref role="3tTeZr" to="slm6:1JWcQ2VeXpD" resolve="check" />
-    </node>
-    <node concept="3uibUv" id="3mI4G9o4$tj" role="1zkMxy">
-      <ref role="3uigEE" to="slm6:5TUCQr2ybBO" resolve="HasMigrationScriptReference" />
-    </node>
-  </node>
-  <node concept="W$Crc" id="79zp7zi8jhO">
-    <property role="3GE5qa" value="refactoring" />
-    <property role="W$Cri" value="4" />
-    <property role="TrG5h" value="Update References: dateLong-&gt;dateLong" />
-    <node concept="1w76tK" id="79zp7zi8jhP" role="1w76sc">
-      <node concept="1w76tN" id="79zp7zi8jhQ" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.updateLocalInstances" />
-        <property role="1w7ld4" value="Update instances in current project" />
-      </node>
-      <node concept="1w76tN" id="79zp7zi8jhR" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.updateModelImports" />
-        <property role="1w7ld4" value="Update model imports" />
-      </node>
-      <node concept="1w76tN" id="79zp7zi8jhS" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.updateReferencesParticipant" />
-        <property role="1w7ld4" value="Update references" />
-      </node>
-      <node concept="1w76tN" id="79zp7zi8jhT" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.writeMigrationScript" />
-        <property role="1w7ld4" value="Write migration script" />
-      </node>
-      <node concept="1w76tN" id="79zp7zi8jhU" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.writeRefactoringLog" />
-        <property role="1w7ld4" value="Write refactoring log" />
-      </node>
-    </node>
-    <node concept="7amoh" id="79zp7zi8jhW" role="W$Crh">
-      <property role="hSBgo" value="moveNode.updateReferences" />
-      <node concept="2pBcaW" id="79zp7zi8jhM" role="hSBgu">
-        <property role="2pBcoG" value="4946522816140922055" />
-        <property role="2pBcow" value="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" />
-        <property role="2pBc3U" value="dateLong" />
-      </node>
-      <node concept="2pBcaW" id="79zp7zi8jhV" role="hSBgs">
-        <property role="2pBcoG" value="4946522816140922055" />
-        <property role="2pBcow" value="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
-        <property role="2pBc3U" value="dateLong" />
-      </node>
-    </node>
-  </node>
-  <node concept="Z5qvL" id="79zp7zi8jhX">
-    <property role="Z5qvQ" value="5" />
-    <property role="TrG5h" value="Migrate_MovePropertyUp_5" />
-    <node concept="Z4OXk" id="79zp7zi8ji8" role="Z5rET">
-      <node concept="2pBcaW" id="79zp7zi8ji6" role="Z5P1v">
-        <property role="2pBcoG" value="4946522816140922055" />
-        <property role="2pBcow" value="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" />
-        <property role="2pBc3U" value="dateLong_old" />
-      </node>
-      <node concept="2pBcaW" id="79zp7zi8ji7" role="Z5P1t">
-        <property role="2pBcoG" value="4946522816140922055" />
-        <property role="2pBcow" value="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
-        <property role="2pBc3U" value="dateLong" />
-      </node>
-      <node concept="7a1rK" id="79zp7zi8ji5" role="7agGg">
-        <node concept="2x5zR_" id="79zp7zi8jhZ" role="HTpAA">
-          <property role="2x5zRA" value="dateLong_old" />
-          <property role="2x5zRo" value="11kxfzuvjwtl3" />
-          <node concept="2x4n5u" id="79zp7zi8ji0" role="2x5zRt">
-            <property role="2x4mPI" value="SmvResultsSolutionBase" />
-            <property role="2x4n5l" value="11kxfzuvjwml4" />
-            <node concept="2V$Bhx" id="79zp7zi8ji1" role="2x4n5j">
-              <property role="2V$B1T" value="7f3eac5a-7f9a-4fbe-8264-f69c70ece985" />
-              <property role="2V$B1Q" value="com.mbeddr.formal.safety.gsn.smv" />
-            </node>
-          </node>
-        </node>
-        <node concept="2x5zR_" id="79zp7zi8ji2" role="HTpA_">
-          <property role="2x5zRA" value="dateLong" />
-          <property role="2x5zRo" value="11kxfzuvjwtl3" />
-          <node concept="2x4n5u" id="79zp7zi8ji3" role="2x5zRt">
-            <property role="2x4mPI" value="IUpdateableSolution" />
-            <property role="2x4o5l" value="true" />
-            <property role="2x4n5l" value="1qmfdcyh7t103" />
-            <node concept="2V$Bhx" id="79zp7zi8ji4" role="2x4n5j">
-              <property role="2V$B1T" value="e8a04d94-4307-4f88-95a2-25f7c4f39437" />
-              <property role="2V$B1Q" value="com.mbeddr.formal.safety.gsn" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="W$Crc" id="79zp7zi8jjK">
-    <property role="3GE5qa" value="refactoring" />
-    <property role="W$Cri" value="5" />
-    <property role="TrG5h" value="Update References: dateShort-&gt;dateShort" />
-    <node concept="1w76tK" id="79zp7zi8jjL" role="1w76sc">
-      <node concept="1w76tN" id="79zp7zi8jjM" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.updateLocalInstances" />
-        <property role="1w7ld4" value="Update instances in current project" />
-      </node>
-      <node concept="1w76tN" id="79zp7zi8jjN" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.updateModelImports" />
-        <property role="1w7ld4" value="Update model imports" />
-      </node>
-      <node concept="1w76tN" id="79zp7zi8jjO" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.updateReferencesParticipant" />
-        <property role="1w7ld4" value="Update references" />
-      </node>
-      <node concept="1w76tN" id="79zp7zi8jjP" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.writeMigrationScript" />
-        <property role="1w7ld4" value="Write migration script" />
-      </node>
-      <node concept="1w76tN" id="79zp7zi8jjQ" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.writeRefactoringLog" />
-        <property role="1w7ld4" value="Write refactoring log" />
-      </node>
-    </node>
-    <node concept="7amoh" id="79zp7zi8jjS" role="W$Crh">
-      <property role="hSBgo" value="moveNode.updateReferences" />
-      <node concept="2pBcaW" id="79zp7zi8jjI" role="hSBgu">
-        <property role="2pBcoG" value="4946522816140921955" />
-        <property role="2pBcow" value="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" />
-        <property role="2pBc3U" value="dateShort" />
-      </node>
-      <node concept="2pBcaW" id="79zp7zi8jjR" role="hSBgs">
-        <property role="2pBcoG" value="4946522816140921955" />
-        <property role="2pBcow" value="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
-        <property role="2pBc3U" value="dateShort" />
-      </node>
-    </node>
-  </node>
-  <node concept="Z5qvL" id="79zp7zi8jjT">
-    <property role="Z5qvQ" value="6" />
-    <property role="TrG5h" value="Migrate_MovePropertyUp_6" />
-    <node concept="Z4OXk" id="79zp7zi8jk4" role="Z5rET">
-      <node concept="2pBcaW" id="79zp7zi8jk2" role="Z5P1v">
-        <property role="2pBcoG" value="4946522816140921955" />
-        <property role="2pBcow" value="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" />
-        <property role="2pBc3U" value="dateShort_old" />
-      </node>
-      <node concept="2pBcaW" id="79zp7zi8jk3" role="Z5P1t">
-        <property role="2pBcoG" value="4946522816140921955" />
-        <property role="2pBcow" value="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
-        <property role="2pBc3U" value="dateShort" />
-      </node>
-      <node concept="7a1rK" id="79zp7zi8jk1" role="7agGg">
-        <node concept="2x5zR_" id="79zp7zi8jjV" role="HTpAA">
-          <property role="2x5zRA" value="dateShort_old" />
-          <property role="2x5zRo" value="11kxfzuvjwtib" />
-          <node concept="2x4n5u" id="79zp7zi8jjW" role="2x5zRt">
-            <property role="2x4mPI" value="SmvResultsSolutionBase" />
-            <property role="2x4n5l" value="11kxfzuvjwml4" />
-            <node concept="2V$Bhx" id="79zp7zi8jjX" role="2x4n5j">
-              <property role="2V$B1T" value="7f3eac5a-7f9a-4fbe-8264-f69c70ece985" />
-              <property role="2V$B1Q" value="com.mbeddr.formal.safety.gsn.smv" />
-            </node>
-          </node>
-        </node>
-        <node concept="2x5zR_" id="79zp7zi8jjY" role="HTpA_">
-          <property role="2x5zRA" value="dateShort" />
-          <property role="2x5zRo" value="11kxfzuvjwtib" />
-          <node concept="2x4n5u" id="79zp7zi8jjZ" role="2x5zRt">
-            <property role="2x4mPI" value="IUpdateableSolution" />
-            <property role="2x4o5l" value="true" />
-            <property role="2x4n5l" value="1qmfdcyh7t103" />
-            <node concept="2V$Bhx" id="79zp7zi8jk0" role="2x4n5j">
-              <property role="2V$B1T" value="e8a04d94-4307-4f88-95a2-25f7c4f39437" />
-              <property role="2V$B1Q" value="com.mbeddr.formal.safety.gsn" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="W$Crc" id="79zp7zi8jli">
-    <property role="3GE5qa" value="refactoring" />
-    <property role="W$Cri" value="6" />
-    <property role="TrG5h" value="Update References: success-&gt;success" />
-    <node concept="1w76tK" id="79zp7zi8jlj" role="1w76sc">
-      <node concept="1w76tN" id="79zp7zi8jlk" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.updateLocalInstances" />
-        <property role="1w7ld4" value="Update instances in current project" />
-      </node>
-      <node concept="1w76tN" id="79zp7zi8jll" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.updateModelImports" />
-        <property role="1w7ld4" value="Update model imports" />
-      </node>
-      <node concept="1w76tN" id="79zp7zi8jlm" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.updateReferencesParticipant" />
-        <property role="1w7ld4" value="Update references" />
-      </node>
-      <node concept="1w76tN" id="79zp7zi8jln" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.writeMigrationScript" />
-        <property role="1w7ld4" value="Write migration script" />
-      </node>
-      <node concept="1w76tN" id="79zp7zi8jlo" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.writeRefactoringLog" />
-        <property role="1w7ld4" value="Write refactoring log" />
-      </node>
-    </node>
-    <node concept="7amoh" id="79zp7zi8jlq" role="W$Crh">
-      <property role="hSBgo" value="moveNode.updateReferences" />
-      <node concept="2pBcaW" id="79zp7zi8jlg" role="hSBgu">
-        <property role="2pBcoG" value="4946522816140921857" />
-        <property role="2pBcow" value="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" />
-        <property role="2pBc3U" value="success" />
-      </node>
-      <node concept="2pBcaW" id="79zp7zi8jlp" role="hSBgs">
-        <property role="2pBcoG" value="4946522816140921857" />
-        <property role="2pBcow" value="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
-        <property role="2pBc3U" value="success" />
-      </node>
-    </node>
-  </node>
-  <node concept="Z5qvL" id="79zp7zi8jlr">
-    <property role="Z5qvQ" value="7" />
-    <property role="TrG5h" value="Migrate_MovePropertyUp_7" />
-    <node concept="Z4OXk" id="79zp7zi8jlA" role="Z5rET">
-      <node concept="2pBcaW" id="79zp7zi8jl$" role="Z5P1v">
-        <property role="2pBcoG" value="4946522816140921857" />
-        <property role="2pBcow" value="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" />
-        <property role="2pBc3U" value="success_old" />
-      </node>
-      <node concept="2pBcaW" id="79zp7zi8jl_" role="Z5P1t">
-        <property role="2pBcoG" value="4946522816140921857" />
-        <property role="2pBcow" value="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
-        <property role="2pBc3U" value="success" />
-      </node>
-      <node concept="7a1rK" id="79zp7zi8jlz" role="7agGg">
-        <node concept="2x5zR_" id="79zp7zi8jlt" role="HTpAA">
-          <property role="2x5zRA" value="success_old" />
-          <property role="2x5zRo" value="11kxfzuvjwtfl" />
-          <node concept="2x4n5u" id="79zp7zi8jlu" role="2x5zRt">
-            <property role="2x4mPI" value="SmvResultsSolutionBase" />
-            <property role="2x4n5l" value="11kxfzuvjwml4" />
-            <node concept="2V$Bhx" id="79zp7zi8jlv" role="2x4n5j">
-              <property role="2V$B1T" value="7f3eac5a-7f9a-4fbe-8264-f69c70ece985" />
-              <property role="2V$B1Q" value="com.mbeddr.formal.safety.gsn.smv" />
-            </node>
-          </node>
-        </node>
-        <node concept="2x5zR_" id="79zp7zi8jlw" role="HTpA_">
-          <property role="2x5zRA" value="success" />
-          <property role="2x5zRo" value="11kxfzuvjwtfl" />
-          <node concept="2x4n5u" id="79zp7zi8jlx" role="2x5zRt">
-            <property role="2x4mPI" value="IUpdateableSolution" />
-            <property role="2x4o5l" value="true" />
-            <property role="2x4n5l" value="1qmfdcyh7t103" />
-            <node concept="2V$Bhx" id="79zp7zi8jly" role="2x4n5j">
-              <property role="2V$B1T" value="e8a04d94-4307-4f88-95a2-25f7c4f39437" />
-              <property role="2V$B1Q" value="com.mbeddr.formal.safety.gsn" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="W$Crc" id="79zp7zi8jmP">
-    <property role="3GE5qa" value="refactoring" />
-    <property role="W$Cri" value="7" />
-    <property role="TrG5h" value="Update References: hashCode-&gt;hashCode" />
-    <node concept="1w76tK" id="79zp7zi8jmQ" role="1w76sc">
-      <node concept="1w76tN" id="79zp7zi8jmR" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.updateLocalInstances" />
-        <property role="1w7ld4" value="Update instances in current project" />
-      </node>
-      <node concept="1w76tN" id="79zp7zi8jmS" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.updateModelImports" />
-        <property role="1w7ld4" value="Update model imports" />
-      </node>
-      <node concept="1w76tN" id="79zp7zi8jmT" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.updateReferencesParticipant" />
-        <property role="1w7ld4" value="Update references" />
-      </node>
-      <node concept="1w76tN" id="79zp7zi8jmU" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.writeMigrationScript" />
-        <property role="1w7ld4" value="Write migration script" />
-      </node>
-      <node concept="1w76tN" id="79zp7zi8jmV" role="1w76tQ">
-        <property role="1w76tO" value="moveNode.options.writeRefactoringLog" />
-        <property role="1w7ld4" value="Write refactoring log" />
-      </node>
-    </node>
-    <node concept="7amoh" id="79zp7zi8jmX" role="W$Crh">
-      <property role="hSBgo" value="moveNode.updateReferences" />
-      <node concept="2pBcaW" id="79zp7zi8jmN" role="hSBgu">
-        <property role="2pBcoG" value="4946522816140915512" />
-        <property role="2pBcow" value="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" />
-        <property role="2pBc3U" value="hashCode" />
-      </node>
-      <node concept="2pBcaW" id="79zp7zi8jmW" role="hSBgs">
-        <property role="2pBcoG" value="4946522816140915512" />
-        <property role="2pBcow" value="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
-        <property role="2pBc3U" value="hashCode" />
-      </node>
-    </node>
-  </node>
-  <node concept="Z5qvL" id="79zp7zi8jmY">
-    <property role="Z5qvQ" value="8" />
-    <property role="TrG5h" value="Migrate_MovePropertyUp_8" />
-    <node concept="Z4OXk" id="79zp7zi8jn9" role="Z5rET">
-      <node concept="2pBcaW" id="79zp7zi8jn7" role="Z5P1v">
-        <property role="2pBcoG" value="4946522816140915512" />
-        <property role="2pBcow" value="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" />
-        <property role="2pBc3U" value="hashCode_old" />
-      </node>
-      <node concept="2pBcaW" id="79zp7zi8jn8" role="Z5P1t">
-        <property role="2pBcoG" value="4946522816140915512" />
-        <property role="2pBcow" value="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
-        <property role="2pBc3U" value="hashCode" />
-      </node>
-      <node concept="7a1rK" id="79zp7zi8jn6" role="7agGg">
-        <node concept="2x5zR_" id="79zp7zi8jn0" role="HTpAA">
-          <property role="2x5zRA" value="hashCode_old" />
-          <property role="2x5zRo" value="11kxfzuvjwojc" />
-          <node concept="2x4n5u" id="79zp7zi8jn1" role="2x5zRt">
-            <property role="2x4mPI" value="SmvResultsSolutionBase" />
-            <property role="2x4n5l" value="11kxfzuvjwml4" />
-            <node concept="2V$Bhx" id="79zp7zi8jn2" role="2x4n5j">
-              <property role="2V$B1T" value="7f3eac5a-7f9a-4fbe-8264-f69c70ece985" />
-              <property role="2V$B1Q" value="com.mbeddr.formal.safety.gsn.smv" />
-            </node>
-          </node>
-        </node>
-        <node concept="2x5zR_" id="79zp7zi8jn3" role="HTpA_">
-          <property role="2x5zRA" value="hashCode" />
-          <property role="2x5zRo" value="11kxfzuvjwojc" />
-          <node concept="2x4n5u" id="79zp7zi8jn4" role="2x5zRt">
-            <property role="2x4mPI" value="IUpdateableSolution" />
-            <property role="2x4o5l" value="true" />
-            <property role="2x4n5l" value="1qmfdcyh7t103" />
-            <node concept="2V$Bhx" id="79zp7zi8jn5" role="2x4n5j">
-              <property role="2V$B1T" value="e8a04d94-4307-4f88-95a2-25f7c4f39437" />
-              <property role="2V$B1Q" value="com.mbeddr.formal.safety.gsn" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
+  <registry />
 </model>
 
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.structure.mps
index baa405302..829478380 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.structure.mps
@@ -30,9 +30,6 @@
       </concept>
     </language>
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
-      <concept id="1224240836180" name="jetbrains.mps.lang.structure.structure.DeprecatedNodeAnnotation" flags="ig" index="asaX9">
-        <property id="1225118933224" name="comment" index="YLQ7P" />
-      </concept>
       <concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
         <property id="6714410169261853888" name="conceptId" index="EcuMT" />
         <property id="4628067390765907488" name="conceptShortDescription" index="R4oN_" />
@@ -58,7 +55,6 @@
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
@@ -218,20 +214,6 @@
     <property role="R5$K7" value="true" />
     <ref role="1TJDcQ" to="py52:2ccN23odQ9b" resolve="SupportedByConnection" />
   </node>
-  <node concept="1TIwiD" id="4i__4Gxs2uL">
-    <property role="EcuMT" value="4946522816140814257" />
-    <property role="TrG5h" value="ComponentInterfaceRef" />
-    <ref role="1TJDcQ" to="2qxf:6rlO$dpPTOC" resolve="AbstractComponentRef" />
-    <node concept="1TJgyj" id="4i__4Gxs2vk" role="1TKVEi">
-      <property role="IQ2ns" value="4946522816140814292" />
-      <property role="20kJfa" value="componentInterface" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" to="3whv:7RhjhI7zUWi" resolve="ComponentInterface" />
-    </node>
-    <node concept="asaX9" id="4MR8i$4iWhX" role="lGtFl">
-      <property role="YLQ7P" value="to remove from FASTEN in releases after March 2020" />
-    </node>
-  </node>
   <node concept="1TIwiD" id="4i__4Gxsq_o">
     <property role="EcuMT" value="4946522816140912984" />
     <property role="3GE5qa" value="gsn.dsl.smv" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.migration.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.migration.mps
index 9f2b0c7b0..45a27ffb5 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.migration.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.migration.mps
@@ -14,216 +14,7 @@
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="slm6" ref="90746344-04fd-4286-97d5-b46ae6a81709/r:52a3d974-bd4f-4651-ba6e-a2de5e336d95(jetbrains.mps.lang.migration/jetbrains.mps.lang.migration.methods)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
-    <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" implicit="true" />
   </imports>
-  <registry>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
-      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
-      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
-        <child id="1197027771414" name="operand" index="2Oq$k0" />
-        <child id="1197027833540" name="operation" index="2OqNvi" />
-      </concept>
-      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
-      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
-        <child id="1165602531693" name="superclass" index="1zkMxy" />
-      </concept>
-      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
-        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
-      </concept>
-      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
-        <child id="5680397130376446158" name="type" index="1tU5fm" />
-      </concept>
-      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
-        <child id="1068580123133" name="returnType" index="3clF45" />
-        <child id="1068580123134" name="parameter" index="3clF46" />
-        <child id="1068580123135" name="body" index="3clF47" />
-      </concept>
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </concept>
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
-        <child id="1068581517665" name="statement" index="3cqZAp" />
-      </concept>
-      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
-        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
-      </concept>
-      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
-      </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
-        <child id="1178549979242" name="visibility" index="1B3o_S" />
-      </concept>
-      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
-    </language>
-    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
-      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
-        <child id="1199569906740" name="parameter" index="1bW2Oz" />
-        <child id="1199569916463" name="body" index="1bW5cS" />
-      </concept>
-    </language>
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl">
-      <concept id="8880393040217246788" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodParameterInstance" flags="ig" index="ffn8J">
-        <reference id="8880393040217294897" name="decl" index="ffrpq" />
-      </concept>
-      <concept id="3751132065236767083" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.DependentTypeInstance" flags="ig" index="q3mfm">
-        <reference id="3751132065236767084" name="decl" index="q3mfh" />
-        <reference id="9097849371505568270" name="point" index="1QQUv3" />
-      </concept>
-      <concept id="3751132065236767060" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodInstance" flags="ig" index="q3mfD">
-        <reference id="19209059688387895" name="decl" index="2VtyIY" />
-      </concept>
-      <concept id="6478870542308708689" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.PropertyInstance" flags="ig" index="3tT0cZ">
-        <reference id="8585153554445465961" name="decl" index="25KYV2" />
-      </concept>
-      <concept id="6478870542308703666" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MemberPlaceholder" flags="ng" index="3tTeZs">
-        <property id="6478870542308703667" name="caption" index="3tTeZt" />
-        <reference id="6478870542308703669" name="decl" index="3tTeZr" />
-      </concept>
-      <concept id="6478870542308871875" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.BooleanPropertyInstance" flags="ig" index="3tYpMH">
-        <property id="6478870542308871876" name="value" index="3tYpME" />
-      </concept>
-    </language>
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
-        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
-      </concept>
-      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
-        <reference id="1138056546658" name="link" index="3TtcxE" />
-      </concept>
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-    <language id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration">
-      <concept id="8352104482584315555" name="jetbrains.mps.lang.migration.structure.MigrationScript" flags="ig" index="3SyAh_">
-        <property id="5820409521797704727" name="fromVersion" index="qMTe8" />
-      </concept>
-    </language>
-    <language id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query">
-      <concept id="7738379549910147341" name="jetbrains.mps.lang.smodel.query.structure.InstancesExpression" flags="ng" index="qVDSY">
-        <child id="7738379549910147342" name="conceptArg" index="qVDSX" />
-      </concept>
-      <concept id="4234138103881610891" name="jetbrains.mps.lang.smodel.query.structure.WithStatement" flags="ng" index="L3pyB">
-        <child id="4234138103881610935" name="scope" index="L3pyr" />
-        <child id="4234138103881610892" name="stmts" index="L3pyw" />
-      </concept>
-    </language>
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
-      <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
-        <child id="1204796294226" name="closure" index="23t8la" />
-      </concept>
-      <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
-        <child id="540871147943773366" name="argument" index="25WWJ7" />
-      </concept>
-      <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
-      <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
-    </language>
-  </registry>
-  <node concept="3SyAh_" id="3Px2xUV1pp7">
-    <property role="qMTe8" value="2" />
-    <property role="TrG5h" value="migrateAttributes" />
-    <node concept="3Tm1VV" id="3Px2xUV1pp8" role="1B3o_S" />
-    <node concept="3tTeZs" id="3Px2xUV1pp9" role="jymVt">
-      <property role="3tTeZt" value="&lt;no execute after&gt;" />
-      <ref role="3tTeZr" to="slm6:7ay_HjIMt1a" resolve="execute after" />
-    </node>
-    <node concept="3tTeZs" id="3Px2xUV1ppa" role="jymVt">
-      <property role="3tTeZt" value="&lt;no required data&gt;" />
-      <ref role="3tTeZr" to="slm6:5TUCQr2FPTh" resolve="requires annotation data" />
-    </node>
-    <node concept="3tTeZs" id="3Px2xUV1ppb" role="jymVt">
-      <property role="3tTeZt" value="&lt;no produced data&gt;" />
-      <ref role="3tTeZr" to="slm6:5TUCQr2C271" resolve="produces annotation data" />
-    </node>
-    <node concept="2tJIrI" id="3Px2xUV1ppc" role="jymVt" />
-    <node concept="3tYpMH" id="3Px2xUV1ppd" role="jymVt">
-      <property role="TrG5h" value="isRerunnable" />
-      <property role="3tYpME" value="true" />
-      <ref role="25KYV2" to="slm6:1JWcQ2VeWIs" resolve="isRerunnable" />
-      <node concept="3Tm1VV" id="3Px2xUV1ppe" role="1B3o_S" />
-      <node concept="10P_77" id="3Px2xUV1ppf" role="1tU5fm" />
-    </node>
-    <node concept="3tTeZs" id="3Px2xUV1ppg" role="jymVt">
-      <property role="3tTeZt" value="&lt;description&gt;" />
-      <ref role="3tTeZr" to="slm6:1_lSsE3RFpE" resolve="description" />
-    </node>
-    <node concept="q3mfD" id="3Px2xUV1pph" role="jymVt">
-      <property role="TrG5h" value="execute" />
-      <ref role="2VtyIY" to="slm6:4ubqdNOF9cA" resolve="execute" />
-      <node concept="3Tm1VV" id="3Px2xUV1ppj" role="1B3o_S" />
-      <node concept="3clFbS" id="3Px2xUV1ppl" role="3clF47">
-        <node concept="L3pyB" id="3Px2xUV1qmF" role="3cqZAp">
-          <node concept="3clFbS" id="3Px2xUV1qmG" role="L3pyw">
-            <node concept="3clFbF" id="3Px2xUV1tEF" role="3cqZAp">
-              <node concept="2OqwBi" id="3Px2xUV1u9E" role="3clFbG">
-                <node concept="qVDSY" id="3Px2xUV1tED" role="2Oq$k0">
-                  <node concept="chp4Y" id="3Px2xUV1tGm" role="qVDSX">
-                    <ref role="cht4Q" to="py52:3GRi4m$qS5k" resolve="GoalStructureElementBase" />
-                  </node>
-                </node>
-                <node concept="2es0OD" id="3Px2xUV1uI6" role="2OqNvi">
-                  <node concept="1bVj0M" id="3Px2xUV1uI8" role="23t8la">
-                    <node concept="3clFbS" id="3Px2xUV1uI9" role="1bW5cS">
-                      <node concept="3clFbF" id="3Px2xUV1uOW" role="3cqZAp">
-                        <node concept="2OqwBi" id="3Px2xUV1wT4" role="3clFbG">
-                          <node concept="2OqwBi" id="3Px2xUV1v2r" role="2Oq$k0">
-                            <node concept="37vLTw" id="3Px2xUV1uOV" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3Px2xUV1uIa" resolve="it" />
-                            </node>
-                            <node concept="3Tsc0h" id="3Px2xUV1vd9" role="2OqNvi">
-                              <ref role="3TtcxE" to="py52:3Px2xUV1gzV" resolve="attributes" />
-                            </node>
-                          </node>
-                          <node concept="X8dFx" id="3Px2xUV1_lZ" role="2OqNvi">
-                            <node concept="2OqwBi" id="3Px2xUV1BJk" role="25WWJ7">
-                              <node concept="37vLTw" id="3Px2xUV1AP5" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3Px2xUV1uIa" resolve="it" />
-                              </node>
-                              <node concept="3Tsc0h" id="3Px2xUV1EIr" role="2OqNvi">
-                                <ref role="3TtcxE" to="py52:6dwPixfdDSe" resolve="attributes_old" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="Rh6nW" id="3Px2xUV1uIa" role="1bW2Oz">
-                      <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="3Px2xUV1uIb" role="1tU5fm" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="37vLTw" id="3Px2xUV1qnl" role="L3pyr">
-            <ref role="3cqZAo" node="3Px2xUV1ppn" resolve="m" />
-          </node>
-        </node>
-      </node>
-      <node concept="ffn8J" id="3Px2xUV1ppn" role="3clF46">
-        <property role="TrG5h" value="m" />
-        <ref role="ffrpq" to="slm6:7fCCGqboj9J" resolve="m" />
-        <node concept="3uibUv" id="3Px2xUV1ppm" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
-        </node>
-      </node>
-      <node concept="q3mfm" id="3Px2xUV1ppo" role="3clF45">
-        <ref role="q3mfh" to="slm6:4F5w8gPXEEe" />
-        <ref role="1QQUv3" node="3Px2xUV1pph" resolve="execute" />
-      </node>
-    </node>
-    <node concept="3tTeZs" id="3Px2xUV1ppp" role="jymVt">
-      <property role="3tTeZt" value="&lt;no result checking&gt;" />
-      <ref role="3tTeZr" to="slm6:1JWcQ2VeXpD" resolve="check" />
-    </node>
-    <node concept="3uibUv" id="3Px2xUV1ppq" role="1zkMxy">
-      <ref role="3uigEE" to="slm6:5TUCQr2ybBO" resolve="HasMigrationScriptReference" />
-    </node>
-  </node>
+  <registry />
 </model>
 
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.structure.mps
index 78e05f408..496d8b115 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.structure.mps
@@ -30,7 +30,6 @@
       </concept>
     </language>
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
-      <concept id="1224240836180" name="jetbrains.mps.lang.structure.structure.DeprecatedNodeAnnotation" flags="ig" index="asaX9" />
       <concept id="7862711839422615209" name="jetbrains.mps.lang.structure.structure.DocumentedNodeAnnotation" flags="ng" index="t5JxF">
         <property id="7862711839422615217" name="text" index="t5JxN" />
       </concept>
@@ -195,14 +194,6 @@
       <property role="20lbJX" value="fLJekj4/_1" />
       <ref role="20lvS9" to="87nw:2dWzqxEB$Tx" resolve="Text" />
     </node>
-    <node concept="1TJgyj" id="6dwPixfdDSe" role="1TKVEi">
-      <property role="IQ2ns" value="7160957776623476238" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="attributes_old" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
-      <ref role="20lvS9" node="6dwPixfdDSd" resolve="GoalStructureAttributeBase" />
-      <node concept="asaX9" id="3Px2xUV1gzT" role="lGtFl" />
-    </node>
     <node concept="1TJgyj" id="3Px2xUV1gzV" role="1TKVEi">
       <property role="IQ2ns" value="4422827436157503739" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.editor.mps
index 99b4919af..4f007d885 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.editor.mps
@@ -22,8 +22,6 @@
       <concept id="1106270549637" name="jetbrains.mps.lang.editor.structure.CellLayout_Horizontal" flags="nn" index="2iRfu4" />
       <concept id="1106270571710" name="jetbrains.mps.lang.editor.structure.CellLayout_Vertical" flags="nn" index="2iRkQZ" />
       <concept id="1237303669825" name="jetbrains.mps.lang.editor.structure.CellLayout_Indent" flags="nn" index="l2Vlx" />
-      <concept id="1142886221719" name="jetbrains.mps.lang.editor.structure.QueryFunction_NodeCondition" flags="in" index="pkWqt" />
-      <concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
       <concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
         <child id="1080736633877" name="cellModel" index="2wV5jI" />
       </concept>
@@ -46,9 +44,6 @@
         <property id="1140017977771" name="readOnly" index="1Intyy" />
         <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
       </concept>
-      <concept id="1073389214265" name="jetbrains.mps.lang.editor.structure.EditorCellModel" flags="ng" index="3EYTF0">
-        <child id="1142887637401" name="renderingCondition" index="pqm2j" />
-      </concept>
       <concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
         <child id="1106270802874" name="cellLayout" index="2iSdaV" />
         <child id="1073389446424" name="childCellModel" index="3EZMnx" />
@@ -65,27 +60,6 @@
         <reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
       </concept>
     </language>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
-        <child id="1197027771414" name="operand" index="2Oq$k0" />
-        <child id="1197027833540" name="operation" index="2OqNvi" />
-      </concept>
-      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
-        <child id="1137022507850" name="body" index="2VODD2" />
-      </concept>
-      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
-      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </concept>
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
-        <child id="1068581517665" name="statement" index="3cqZAp" />
-      </concept>
-      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
-        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
-        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
-      </concept>
-    </language>
     <language id="7e450f4e-1ac3-41ef-a851-4598161bdb94" name="de.slisson.mps.tables">
       <concept id="1397920687865593407" name="de.slisson.mps.tables.structure.PartialTable" flags="ng" index="2r0Tta">
         <child id="1397920687865593523" name="cells" index="2r0Tv6" />
@@ -109,12 +83,6 @@
         <child id="1397920687864865354" name="cells" index="2rf8GZ" />
       </concept>
     </language>
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
-      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
-        <reference id="1138056516764" name="link" index="3Tt5mk" />
-      </concept>
-    </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
@@ -166,56 +134,14 @@
           </node>
         </node>
         <node concept="2reCLy" id="2hOvri9WUql" role="2reCL6">
-          <node concept="3EZMnI" id="6RZi9iiwjk_" role="2reSmM">
-            <node concept="2iRkQZ" id="6RZi9iiwjkA" role="2iSdaV" />
-            <node concept="1iCGBv" id="2hOvri9WUq$" role="3EZMnx">
-              <ref role="1NtTu8" to="cjwq:2hOvri9WUpw" resolve="loss" />
-              <node concept="1sVBvm" id="2hOvri9WUqA" role="1sWHZn">
-                <node concept="3F0A7n" id="2hOvri9WUqH" role="2wV5jI">
-                  <property role="1Intyy" value="true" />
-                  <ref role="1NtTu8" to="cjwq:2hOvri9WL4h" resolve="id" />
-                </node>
-              </node>
-              <node concept="pkWqt" id="6RZi9iiwhZi" role="pqm2j">
-                <node concept="3clFbS" id="6RZi9iiwhZj" role="2VODD2">
-                  <node concept="3clFbF" id="6RZi9iiwi3f" role="3cqZAp">
-                    <node concept="2OqwBi" id="6RZi9iiwiRy" role="3clFbG">
-                      <node concept="2OqwBi" id="6RZi9iiwii_" role="2Oq$k0">
-                        <node concept="pncrf" id="6RZi9iiwi3e" role="2Oq$k0" />
-                        <node concept="3TrEf2" id="6RZi9iiwiBL" role="2OqNvi">
-                          <ref role="3Tt5mk" to="cjwq:2hOvri9WUpw" resolve="loss" />
-                        </node>
-                      </node>
-                      <node concept="3x8VRR" id="6RZi9iiwj8z" role="2OqNvi" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3F2HdR" id="6RZi9iiwjHg" role="3EZMnx">
-              <property role="2czwfO" value="," />
-              <ref role="1NtTu8" to="cjwq:6RZi9iiwhYM" resolve="losses" />
-              <node concept="2iRfu4" id="6RZi9iiwjS7" role="2czzBx" />
-              <node concept="pkWqt" id="6RZi9iix$53" role="pqm2j">
-                <node concept="3clFbS" id="6RZi9iix$54" role="2VODD2">
-                  <node concept="3clFbF" id="6RZi9iix$5t" role="3cqZAp">
-                    <node concept="3clFbC" id="6RZi9iix$MV" role="3clFbG">
-                      <node concept="10Nm6u" id="6RZi9iix_38" role="3uHU7w" />
-                      <node concept="2OqwBi" id="6RZi9iix$kP" role="3uHU7B">
-                        <node concept="pncrf" id="6RZi9iix$5s" role="2Oq$k0" />
-                        <node concept="3TrEf2" id="6RZi9iix$A6" role="2OqNvi">
-                          <ref role="3Tt5mk" to="cjwq:2hOvri9WUpw" resolve="loss" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
           <node concept="2rfbtV" id="2hOvri9WUqK" role="2recC9">
             <property role="2rfbtB" value="Associated losses" />
           </node>
+          <node concept="3F2HdR" id="6RZi9iiwjHg" role="2reSmM">
+            <property role="2czwfO" value="," />
+            <ref role="1NtTu8" to="cjwq:6RZi9iiwhYM" resolve="losses" />
+            <node concept="2iRfu4" id="6RZi9iiwjS7" role="2czzBx" />
+          </node>
         </node>
       </node>
     </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.structure.mps
index b45eff40d..1a47047dc 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.structure.mps
@@ -31,7 +31,6 @@
       </concept>
     </language>
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
-      <concept id="1224240836180" name="jetbrains.mps.lang.structure.structure.DeprecatedNodeAnnotation" flags="ig" index="asaX9" />
       <concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
         <property id="6714410169261853888" name="conceptId" index="EcuMT" />
         <property id="4628067390765907488" name="conceptShortDescription" index="R4oN_" />
@@ -67,7 +66,6 @@
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
@@ -121,12 +119,6 @@
     <node concept="PrWs8" id="7TjUbLQ4gDe" role="PzmwI">
       <ref role="PrY4T" node="7TjUbLQ4gDb" resolve="IHazardLike" />
     </node>
-    <node concept="1TJgyj" id="2hOvri9WUpw" role="1TKVEi">
-      <property role="IQ2ns" value="2626862697025873504" />
-      <property role="20kJfa" value="loss" />
-      <ref role="20lvS9" node="2hOvri9WL4e" resolve="Loss" />
-      <node concept="asaX9" id="6RZi9iiwhZg" role="lGtFl" />
-    </node>
     <node concept="1TJgyj" id="6RZi9iiwhYM" role="1TKVEi">
       <property role="IQ2ns" value="7926133672145657778" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.editor.mps
index 275d498b9..a9ae97cc8 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.editor.mps
@@ -27,7 +27,6 @@
       </concept>
       <concept id="1106270549637" name="jetbrains.mps.lang.editor.structure.CellLayout_Horizontal" flags="nn" index="2iRfu4" />
       <concept id="1106270571710" name="jetbrains.mps.lang.editor.structure.CellLayout_Vertical" flags="nn" index="2iRkQZ" />
-      <concept id="1142886221719" name="jetbrains.mps.lang.editor.structure.QueryFunction_NodeCondition" flags="in" index="pkWqt" />
       <concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
       <concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
         <child id="1080736633877" name="cellModel" index="2wV5jI" />
@@ -58,12 +57,8 @@
         <reference id="1227861587090" name="link" index="3ygfmf" />
       </concept>
       <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
-        <property id="1140017977771" name="readOnly" index="1Intyy" />
         <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
       </concept>
-      <concept id="1073389214265" name="jetbrains.mps.lang.editor.structure.EditorCellModel" flags="ng" index="3EYTF0">
-        <child id="1142887637401" name="renderingCondition" index="pqm2j" />
-      </concept>
       <concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
         <child id="1106270802874" name="cellLayout" index="2iSdaV" />
         <child id="1073389446424" name="childCellModel" index="3EZMnx" />
@@ -99,8 +94,6 @@
       <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
         <child id="1137022507850" name="body" index="2VODD2" />
       </concept>
-      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
-      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
@@ -113,10 +106,6 @@
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
       </concept>
-      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
-        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
-        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
-      </concept>
     </language>
     <language id="7e450f4e-1ac3-41ef-a851-4598161bdb94" name="de.slisson.mps.tables">
       <concept id="1397920687865593407" name="de.slisson.mps.tables.structure.PartialTable" flags="ng" index="2r0Tta">
@@ -146,7 +135,6 @@
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
-      <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
@@ -187,57 +175,15 @@
           <ref role="2reCK$" to="1w8j:55oVyA0lgr9" resolve="hazardContexts" />
         </node>
         <node concept="2reCLy" id="2hOvri9WUql" role="2reCL6">
-          <node concept="3EZMnI" id="6RZi9iiwjk_" role="2reSmM">
-            <node concept="2iRkQZ" id="6RZi9iiwjkA" role="2iSdaV" />
-            <node concept="1iCGBv" id="2hOvri9WUq$" role="3EZMnx">
-              <ref role="1NtTu8" to="cjwq:2hOvri9WUpw" resolve="loss" />
-              <node concept="1sVBvm" id="2hOvri9WUqA" role="1sWHZn">
-                <node concept="3F0A7n" id="2hOvri9WUqH" role="2wV5jI">
-                  <property role="1Intyy" value="true" />
-                  <ref role="1NtTu8" to="cjwq:2hOvri9WL4h" resolve="id" />
-                </node>
-              </node>
-              <node concept="pkWqt" id="6RZi9iiwhZi" role="pqm2j">
-                <node concept="3clFbS" id="6RZi9iiwhZj" role="2VODD2">
-                  <node concept="3clFbF" id="6RZi9iiwi3f" role="3cqZAp">
-                    <node concept="2OqwBi" id="6RZi9iiwiRy" role="3clFbG">
-                      <node concept="2OqwBi" id="6RZi9iiwii_" role="2Oq$k0">
-                        <node concept="pncrf" id="6RZi9iiwi3e" role="2Oq$k0" />
-                        <node concept="3TrEf2" id="6RZi9iiwiBL" role="2OqNvi">
-                          <ref role="3Tt5mk" to="cjwq:2hOvri9WUpw" resolve="loss" />
-                        </node>
-                      </node>
-                      <node concept="3x8VRR" id="6RZi9iiwj8z" role="2OqNvi" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3F2HdR" id="6RZi9iiwjHg" role="3EZMnx">
-              <property role="2czwfO" value="," />
-              <ref role="1NtTu8" to="cjwq:6RZi9iiwhYM" resolve="losses" />
-              <node concept="2iRfu4" id="6RZi9iiwjS7" role="2czzBx" />
-              <node concept="pkWqt" id="6RZi9iixxuO" role="pqm2j">
-                <node concept="3clFbS" id="6RZi9iixxuP" role="2VODD2">
-                  <node concept="3clFbF" id="6RZi9iixxyL" role="3cqZAp">
-                    <node concept="3clFbC" id="6RZi9iixzCw" role="3clFbG">
-                      <node concept="10Nm6u" id="6RZi9iixzMN" role="3uHU7w" />
-                      <node concept="2OqwBi" id="6RZi9iixxN7" role="3uHU7B">
-                        <node concept="pncrf" id="6RZi9iixxyK" role="2Oq$k0" />
-                        <node concept="3TrEf2" id="6RZi9iixy78" role="2OqNvi">
-                          <ref role="3Tt5mk" to="cjwq:2hOvri9WUpw" resolve="loss" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3F0ifn" id="55oVyA0l8jx" role="2czzBI" />
-            </node>
-          </node>
           <node concept="2rfbtV" id="2hOvri9WUqK" role="2recC9">
             <property role="2rfbtB" value="Losses" />
           </node>
+          <node concept="3F2HdR" id="6RZi9iiwjHg" role="2reSmM">
+            <property role="2czwfO" value="," />
+            <ref role="1NtTu8" to="cjwq:6RZi9iiwhYM" resolve="losses" />
+            <node concept="2iRfu4" id="6RZi9iiwjS7" role="2czzBx" />
+            <node concept="3F0ifn" id="55oVyA0l8jx" role="2czzBI" />
+          </node>
         </node>
       </node>
     </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.migration.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.migration.mps
index 2d83a4f07..ac4e07150 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.migration.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.migration.mps
@@ -13,365 +13,7 @@
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="slm6" ref="90746344-04fd-4286-97d5-b46ae6a81709/r:52a3d974-bd4f-4651-ba6e-a2de5e336d95(jetbrains.mps.lang.migration/jetbrains.mps.lang.migration.methods)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
-    <import index="1w8j" ref="r:0631ef51-dd11-46fa-a4db-001e68da09c6(com.mbeddr.formal.safety.iso26262.structure)" implicit="true" />
   </imports>
-  <registry>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
-      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
-      <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
-        <child id="1154032183016" name="body" index="2LFqv$" />
-      </concept>
-      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
-        <child id="1197027771414" name="operand" index="2Oq$k0" />
-        <child id="1197027833540" name="operation" index="2OqNvi" />
-      </concept>
-      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
-      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
-      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
-        <child id="1165602531693" name="superclass" index="1zkMxy" />
-      </concept>
-      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
-        <child id="1068431790190" name="initializer" index="33vP2m" />
-      </concept>
-      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
-        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
-      </concept>
-      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
-        <child id="5680397130376446158" name="type" index="1tU5fm" />
-      </concept>
-      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
-        <child id="1068580123133" name="returnType" index="3clF45" />
-        <child id="1068580123134" name="parameter" index="3clF46" />
-        <child id="1068580123135" name="body" index="3clF47" />
-      </concept>
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </concept>
-      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
-        <child id="1068580123160" name="condition" index="3clFbw" />
-        <child id="1068580123161" name="ifTrue" index="3clFbx" />
-      </concept>
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
-        <child id="1068581517665" name="statement" index="3cqZAp" />
-      </concept>
-      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
-        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
-      </concept>
-      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
-        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
-      </concept>
-      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
-        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
-      </concept>
-      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
-      </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
-        <child id="1178549979242" name="visibility" index="1B3o_S" />
-      </concept>
-      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
-    </language>
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl">
-      <concept id="8880393040217246788" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodParameterInstance" flags="ig" index="ffn8J">
-        <reference id="8880393040217294897" name="decl" index="ffrpq" />
-      </concept>
-      <concept id="3751132065236767083" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.DependentTypeInstance" flags="ig" index="q3mfm">
-        <reference id="3751132065236767084" name="decl" index="q3mfh" />
-        <reference id="9097849371505568270" name="point" index="1QQUv3" />
-      </concept>
-      <concept id="3751132065236767060" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodInstance" flags="ig" index="q3mfD">
-        <reference id="19209059688387895" name="decl" index="2VtyIY" />
-      </concept>
-      <concept id="6478870542308708689" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.PropertyInstance" flags="ig" index="3tT0cZ">
-        <reference id="8585153554445465961" name="decl" index="25KYV2" />
-      </concept>
-      <concept id="6478870542308703666" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MemberPlaceholder" flags="ng" index="3tTeZs">
-        <property id="6478870542308703667" name="caption" index="3tTeZt" />
-        <reference id="6478870542308703669" name="decl" index="3tTeZr" />
-      </concept>
-      <concept id="6478870542308871875" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.BooleanPropertyInstance" flags="ig" index="3tYpMH">
-        <property id="6478870542308871876" name="value" index="3tYpME" />
-      </concept>
-    </language>
-    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
-      <concept id="5455284157994012186" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitLink" flags="ng" index="2pIpSj">
-        <reference id="5455284157994012188" name="link" index="2pIpSl" />
-        <child id="1595412875168045827" name="initValue" index="28nt2d" />
-      </concept>
-      <concept id="5455284157993911077" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitProperty" flags="ng" index="2pJxcG">
-        <reference id="5455284157993911078" name="property" index="2pJxcJ" />
-        <child id="1595412875168045201" name="initValue" index="28ntcv" />
-      </concept>
-      <concept id="5455284157993863837" name="jetbrains.mps.lang.quotation.structure.NodeBuilder" flags="nn" index="2pJPEk">
-        <child id="5455284157993863838" name="quotedNode" index="2pJPEn" />
-      </concept>
-      <concept id="5455284157993863840" name="jetbrains.mps.lang.quotation.structure.NodeBuilderNode" flags="nn" index="2pJPED">
-        <reference id="5455284157993910961" name="concept" index="2pJxaS" />
-        <child id="5455284157993911099" name="values" index="2pJxcM" />
-      </concept>
-      <concept id="6985522012210254362" name="jetbrains.mps.lang.quotation.structure.NodeBuilderPropertyExpression" flags="nn" index="WxPPo">
-        <child id="6985522012210254363" name="expression" index="WxPPp" />
-      </concept>
-      <concept id="8182547171709752110" name="jetbrains.mps.lang.quotation.structure.NodeBuilderExpression" flags="nn" index="36biLy">
-        <child id="8182547171709752112" name="expression" index="36biLW" />
-      </concept>
-    </language>
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
-        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
-      </concept>
-      <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
-      <concept id="1171323947159" name="jetbrains.mps.lang.smodel.structure.Model_NodesOperation" flags="nn" index="2SmgA7">
-        <child id="1758937410080001570" name="conceptArgument" index="1dBWTz" />
-      </concept>
-      <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
-        <reference id="1138056395725" name="property" index="3TsBF5" />
-      </concept>
-      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
-        <reference id="1138056546658" name="link" index="3TtcxE" />
-      </concept>
-      <concept id="1215467301810" name="jetbrains.mps.lang.smodel.structure.Property_RemoveOperation" flags="nn" index="3ZvMEC" />
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-    <language id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration">
-      <concept id="8352104482584315555" name="jetbrains.mps.lang.migration.structure.MigrationScript" flags="ig" index="3SyAh_">
-        <property id="5820409521797704727" name="fromVersion" index="qMTe8" />
-      </concept>
-    </language>
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
-      <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
-        <child id="540871147943773366" name="argument" index="25WWJ7" />
-      </concept>
-      <concept id="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
-        <child id="1153944400369" name="variable" index="2Gsz3X" />
-        <child id="1153944424730" name="inputSequence" index="2GsD0m" />
-      </concept>
-      <concept id="1153944193378" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariable" flags="nr" index="2GrKxI" />
-      <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
-        <reference id="1153944258490" name="variable" index="2Gs0qQ" />
-      </concept>
-      <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
-      <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
-    </language>
-  </registry>
-  <node concept="3SyAh_" id="55oVyA0lNIU">
-    <property role="qMTe8" value="0" />
-    <property role="TrG5h" value="MigrateASILInfoFromHazardToOperationalSituation" />
-    <node concept="3Tm1VV" id="55oVyA0lNIV" role="1B3o_S" />
-    <node concept="3tTeZs" id="55oVyA0lNIW" role="jymVt">
-      <property role="3tTeZt" value="&lt;no execute after&gt;" />
-      <ref role="3tTeZr" to="slm6:7ay_HjIMt1a" resolve="execute after" />
-    </node>
-    <node concept="3tTeZs" id="55oVyA0lNIX" role="jymVt">
-      <property role="3tTeZt" value="&lt;no required data&gt;" />
-      <ref role="3tTeZr" to="slm6:5TUCQr2FPTh" resolve="requires annotation data" />
-    </node>
-    <node concept="3tTeZs" id="55oVyA0lNIY" role="jymVt">
-      <property role="3tTeZt" value="&lt;no produced data&gt;" />
-      <ref role="3tTeZr" to="slm6:5TUCQr2C271" resolve="produces annotation data" />
-    </node>
-    <node concept="2tJIrI" id="55oVyA0lNIZ" role="jymVt" />
-    <node concept="3tYpMH" id="55oVyA0lNJ0" role="jymVt">
-      <property role="TrG5h" value="isRerunnable" />
-      <property role="3tYpME" value="true" />
-      <ref role="25KYV2" to="slm6:1JWcQ2VeWIs" resolve="isRerunnable" />
-      <node concept="3Tm1VV" id="55oVyA0lNJ1" role="1B3o_S" />
-      <node concept="10P_77" id="55oVyA0lNJ2" role="1tU5fm" />
-    </node>
-    <node concept="3tTeZs" id="55oVyA0lNJ3" role="jymVt">
-      <property role="3tTeZt" value="&lt;description&gt;" />
-      <ref role="3tTeZr" to="slm6:1_lSsE3RFpE" resolve="description" />
-    </node>
-    <node concept="q3mfD" id="55oVyA0lNJ4" role="jymVt">
-      <property role="TrG5h" value="execute" />
-      <ref role="2VtyIY" to="slm6:4ubqdNOF9cA" resolve="execute" />
-      <node concept="3Tm1VV" id="55oVyA0lNJ6" role="1B3o_S" />
-      <node concept="3clFbS" id="55oVyA0lNJ8" role="3clF47">
-        <node concept="2Gpval" id="55oVyA0lRCo" role="3cqZAp">
-          <node concept="2GrKxI" id="55oVyA0lRCp" role="2Gsz3X">
-            <property role="TrG5h" value="crt" />
-          </node>
-          <node concept="2OqwBi" id="55oVyA0lRKo" role="2GsD0m">
-            <node concept="37vLTw" id="55oVyA0lRDd" role="2Oq$k0">
-              <ref role="3cqZAo" node="55oVyA0lNJa" resolve="m" />
-            </node>
-            <node concept="liA8E" id="55oVyA0lS_5" role="2OqNvi">
-              <ref role="37wK5l" to="lui2:~SModule.getModels()" resolve="getModels" />
-            </node>
-          </node>
-          <node concept="3clFbS" id="55oVyA0lRCr" role="2LFqv$">
-            <node concept="3cpWs8" id="55oVyA0lSIW" role="3cqZAp">
-              <node concept="3cpWsn" id="55oVyA0lSIZ" role="3cpWs9">
-                <property role="TrG5h" value="crtModel" />
-                <node concept="H_c77" id="55oVyA0lSIV" role="1tU5fm" />
-                <node concept="2GrUjf" id="55oVyA0lSKJ" role="33vP2m">
-                  <ref role="2Gs0qQ" node="55oVyA0lRCp" resolve="crt" />
-                </node>
-              </node>
-            </node>
-            <node concept="2Gpval" id="55oVyA0lXlv" role="3cqZAp">
-              <node concept="2GrKxI" id="55oVyA0lXlx" role="2Gsz3X">
-                <property role="TrG5h" value="h" />
-              </node>
-              <node concept="3clFbS" id="55oVyA0lXl_" role="2LFqv$">
-                <node concept="3clFbJ" id="55oVyA0lXtI" role="3cqZAp">
-                  <node concept="2OqwBi" id="55oVyA0m05$" role="3clFbw">
-                    <node concept="2OqwBi" id="55oVyA0lXFS" role="2Oq$k0">
-                      <node concept="2GrUjf" id="55oVyA0lXuh" role="2Oq$k0">
-                        <ref role="2Gs0qQ" node="55oVyA0lXlx" resolve="h" />
-                      </node>
-                      <node concept="3Tsc0h" id="55oVyA0lYrp" role="2OqNvi">
-                        <ref role="3TtcxE" to="1w8j:55oVyA0lgr9" resolve="hazardContexts" />
-                      </node>
-                    </node>
-                    <node concept="1v1jN8" id="55oVyA0m3Eh" role="2OqNvi" />
-                  </node>
-                  <node concept="3clFbS" id="55oVyA0lXtK" role="3clFbx">
-                    <node concept="3clFbF" id="55oVyA0m3Il" role="3cqZAp">
-                      <node concept="2OqwBi" id="55oVyA0m771" role="3clFbG">
-                        <node concept="2OqwBi" id="55oVyA0m3Tx" role="2Oq$k0">
-                          <node concept="2GrUjf" id="55oVyA0m3Ik" role="2Oq$k0">
-                            <ref role="2Gs0qQ" node="55oVyA0lXlx" resolve="h" />
-                          </node>
-                          <node concept="3Tsc0h" id="55oVyA0m4lc" role="2OqNvi">
-                            <ref role="3TtcxE" to="1w8j:55oVyA0lgr9" resolve="hazardContexts" />
-                          </node>
-                        </node>
-                        <node concept="TSZUe" id="55oVyA0m9ka" role="2OqNvi">
-                          <node concept="2pJPEk" id="55oVyA0mgQY" role="25WWJ7">
-                            <node concept="2pJPED" id="55oVyA0mhbe" role="2pJPEn">
-                              <ref role="2pJxaS" to="1w8j:55oVyA0lgqZ" resolve="HazardContext" />
-                              <node concept="2pJxcG" id="55oVyA0mhoo" role="2pJxcM">
-                                <ref role="2pJxcJ" to="1w8j:55oVyA0lgr2" resolve="controlability" />
-                                <node concept="WxPPo" id="55oVyA0mh$I" role="28ntcv">
-                                  <node concept="2OqwBi" id="55oVyA0mhMm" role="WxPPp">
-                                    <node concept="2GrUjf" id="55oVyA0mh$G" role="2Oq$k0">
-                                      <ref role="2Gs0qQ" node="55oVyA0lXlx" resolve="h" />
-                                    </node>
-                                    <node concept="3TrcHB" id="55oVyA0milw" role="2OqNvi">
-                                      <ref role="3TsBF5" to="1w8j:24PsEXFbNLB" resolve="controlability" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="2pJxcG" id="55oVyA0miHb" role="2pJxcM">
-                                <ref role="2pJxcJ" to="1w8j:55oVyA0lgr1" resolve="exposure" />
-                                <node concept="WxPPo" id="55oVyA0miTC" role="28ntcv">
-                                  <node concept="2OqwBi" id="55oVyA0mj7g" role="WxPPp">
-                                    <node concept="2GrUjf" id="55oVyA0miTA" role="2Oq$k0">
-                                      <ref role="2Gs0qQ" node="55oVyA0lXlx" resolve="h" />
-                                    </node>
-                                    <node concept="3TrcHB" id="55oVyA0mjGe" role="2OqNvi">
-                                      <ref role="3TsBF5" to="1w8j:24PsEXFbNL$" resolve="exposure" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="2pJxcG" id="55oVyA0mk1L" role="2pJxcM">
-                                <ref role="2pJxcJ" to="1w8j:55oVyA0lgr0" resolve="severity" />
-                                <node concept="WxPPo" id="55oVyA0mkeb" role="28ntcv">
-                                  <node concept="2OqwBi" id="55oVyA0mkrN" role="WxPPp">
-                                    <node concept="2GrUjf" id="55oVyA0mke9" role="2Oq$k0">
-                                      <ref role="2Gs0qQ" node="55oVyA0lXlx" resolve="h" />
-                                    </node>
-                                    <node concept="3TrcHB" id="55oVyA0ml1D" role="2OqNvi">
-                                      <ref role="3TsBF5" to="1w8j:24PsEXFbNLy" resolve="severity" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="2pIpSj" id="55oVyA0mltA" role="2pJxcM">
-                                <ref role="2pIpSl" to="1w8j:55oVyA0lsaC" resolve="operationalSituationDeclaration" />
-                                <node concept="36biLy" id="55oVyA0mlFH" role="28nt2d">
-                                  <node concept="10Nm6u" id="55oVyA0mlFF" role="36biLW" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="55oVyA0mlLJ" role="3cqZAp">
-                      <node concept="2OqwBi" id="55oVyA0mn16" role="3clFbG">
-                        <node concept="2OqwBi" id="55oVyA0mlWV" role="2Oq$k0">
-                          <node concept="2GrUjf" id="55oVyA0mlLH" role="2Oq$k0">
-                            <ref role="2Gs0qQ" node="55oVyA0lXlx" resolve="h" />
-                          </node>
-                          <node concept="3TrcHB" id="55oVyA0mmQY" role="2OqNvi">
-                            <ref role="3TsBF5" to="1w8j:24PsEXFbNLB" resolve="controlability" />
-                          </node>
-                        </node>
-                        <node concept="3ZvMEC" id="55oVyA0mntr" role="2OqNvi" />
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="55oVyA0mnxH" role="3cqZAp">
-                      <node concept="2OqwBi" id="55oVyA0moQq" role="3clFbG">
-                        <node concept="2OqwBi" id="55oVyA0mnGT" role="2Oq$k0">
-                          <node concept="2GrUjf" id="55oVyA0mnxF" role="2Oq$k0">
-                            <ref role="2Gs0qQ" node="55oVyA0lXlx" resolve="h" />
-                          </node>
-                          <node concept="3TrcHB" id="55oVyA0moF7" role="2OqNvi">
-                            <ref role="3TsBF5" to="1w8j:24PsEXFbNL$" resolve="exposure" />
-                          </node>
-                        </node>
-                        <node concept="3ZvMEC" id="55oVyA0mpcE" role="2OqNvi" />
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="55oVyA0mph2" role="3cqZAp">
-                      <node concept="2OqwBi" id="55oVyA0mqb9" role="3clFbG">
-                        <node concept="2OqwBi" id="55oVyA0mpse" role="2Oq$k0">
-                          <node concept="2GrUjf" id="55oVyA0mph0" role="2Oq$k0">
-                            <ref role="2Gs0qQ" node="55oVyA0lXlx" resolve="h" />
-                          </node>
-                          <node concept="3TrcHB" id="55oVyA0mq2r" role="2OqNvi">
-                            <ref role="3TsBF5" to="1w8j:24PsEXFbNLy" resolve="severity" />
-                          </node>
-                        </node>
-                        <node concept="3ZvMEC" id="55oVyA0mq$9" role="2OqNvi" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="2OqwBi" id="55oVyA0lT3i" role="2GsD0m">
-                <node concept="37vLTw" id="55oVyA0lSVW" role="2Oq$k0">
-                  <ref role="3cqZAo" node="55oVyA0lSIZ" resolve="crtModel" />
-                </node>
-                <node concept="2SmgA7" id="55oVyA0lVzT" role="2OqNvi">
-                  <node concept="chp4Y" id="55oVyA0lWIi" role="1dBWTz">
-                    <ref role="cht4Q" to="1w8j:24PsEXFbC2f" resolve="ISO26262Hazard" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="ffn8J" id="55oVyA0lNJa" role="3clF46">
-        <property role="TrG5h" value="m" />
-        <ref role="ffrpq" to="slm6:7fCCGqboj9J" resolve="m" />
-        <node concept="3uibUv" id="55oVyA0lNJ9" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
-        </node>
-      </node>
-      <node concept="q3mfm" id="55oVyA0lNJb" role="3clF45">
-        <ref role="q3mfh" to="slm6:4F5w8gPXEEe" />
-        <ref role="1QQUv3" node="55oVyA0lNJ4" resolve="execute" />
-      </node>
-    </node>
-    <node concept="3tTeZs" id="55oVyA0lNJc" role="jymVt">
-      <property role="3tTeZt" value="&lt;no result checking&gt;" />
-      <ref role="3tTeZr" to="slm6:1JWcQ2VeXpD" resolve="check" />
-    </node>
-    <node concept="3uibUv" id="55oVyA0lNJd" role="1zkMxy">
-      <ref role="3uigEE" to="slm6:5TUCQr2ybBO" resolve="HasMigrationScriptReference" />
-    </node>
-  </node>
+  <registry />
 </model>
 
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.structure.mps
index dd3673059..fd06c453d 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.structure.mps
@@ -38,7 +38,6 @@
         <reference id="1075010451642646892" name="defaultMember" index="1H5jkz" />
         <child id="3348158742936976577" name="members" index="25R1y" />
       </concept>
-      <concept id="1224240836180" name="jetbrains.mps.lang.structure.structure.DeprecatedNodeAnnotation" flags="ig" index="asaX9" />
       <concept id="1082978164218" name="jetbrains.mps.lang.structure.structure.DataTypeDeclaration" flags="ng" index="AxPO6">
         <property id="7791109065626895363" name="datatypeId" index="3F6X1D" />
       </concept>
@@ -74,7 +73,6 @@
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
@@ -87,24 +85,6 @@
     <property role="34LRSv" value="hazardous event" />
     <property role="R4oN_" value="according to ISO 26262" />
     <ref role="1TJDcQ" to="cjwq:7TjUbLQ451K" resolve="Hazard" />
-    <node concept="1TJgyi" id="24PsEXFbNLy" role="1TKVEl">
-      <property role="IQ2nx" value="2392944874760387682" />
-      <property role="TrG5h" value="severity" />
-      <ref role="AX2Wp" node="24PsEXFbNKL" resolve="ESeverity" />
-      <node concept="asaX9" id="55oVyA0mzVH" role="lGtFl" />
-    </node>
-    <node concept="1TJgyi" id="24PsEXFbNL$" role="1TKVEl">
-      <property role="IQ2nx" value="2392944874760387684" />
-      <property role="TrG5h" value="exposure" />
-      <ref role="AX2Wp" node="24PsEXFbNL0" resolve="EExposure" />
-      <node concept="asaX9" id="55oVyA0mzVN" role="lGtFl" />
-    </node>
-    <node concept="1TJgyi" id="24PsEXFbNLB" role="1TKVEl">
-      <property role="IQ2nx" value="2392944874760387687" />
-      <property role="TrG5h" value="controlability" />
-      <ref role="AX2Wp" node="24PsEXFbNLk" resolve="EControlability" />
-      <node concept="asaX9" id="55oVyA0mzVT" role="lGtFl" />
-    </node>
     <node concept="1TJgyj" id="55oVyA0lgr9" role="1TKVEi">
       <property role="IQ2ns" value="5861696777036826313" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.migration.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.migration.mps
index 0c4d9f9ef..dcd891fa8 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.migration.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.migration.mps
@@ -13,304 +13,7 @@
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="slm6" ref="90746344-04fd-4286-97d5-b46ae6a81709/r:52a3d974-bd4f-4651-ba6e-a2de5e336d95(jetbrains.mps.lang.migration/jetbrains.mps.lang.migration.methods)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
-    <import index="30zx" ref="r:c74e2282-8641-453d-b9cc-e065e14a0117(com.mbeddr.formal.safety.req.structure)" implicit="true" />
-    <import index="cjwq" ref="r:7e1f4da1-19b3-4ceb-bcab-0237eb7a50b7(com.mbeddr.formal.safety.hara.structure)" implicit="true" />
   </imports>
-  <registry>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
-        <child id="1068498886297" name="rValue" index="37vLTx" />
-        <child id="1068498886295" name="lValue" index="37vLTJ" />
-      </concept>
-      <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
-      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
-      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
-      <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
-        <child id="1154032183016" name="body" index="2LFqv$" />
-      </concept>
-      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
-        <child id="1197027771414" name="operand" index="2Oq$k0" />
-        <child id="1197027833540" name="operation" index="2OqNvi" />
-      </concept>
-      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
-      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
-      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
-        <child id="1165602531693" name="superclass" index="1zkMxy" />
-      </concept>
-      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
-        <child id="1068431790190" name="initializer" index="33vP2m" />
-      </concept>
-      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
-        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
-      </concept>
-      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
-      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
-        <child id="5680397130376446158" name="type" index="1tU5fm" />
-      </concept>
-      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
-        <child id="1068580123133" name="returnType" index="3clF45" />
-        <child id="1068580123134" name="parameter" index="3clF46" />
-        <child id="1068580123135" name="body" index="3clF47" />
-      </concept>
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </concept>
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
-        <child id="1068581517665" name="statement" index="3cqZAp" />
-      </concept>
-      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
-        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
-      </concept>
-      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
-        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
-      </concept>
-      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
-        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
-      </concept>
-      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
-      </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
-        <child id="1178549979242" name="visibility" index="1B3o_S" />
-      </concept>
-      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
-    </language>
-    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
-      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
-        <child id="1199569906740" name="parameter" index="1bW2Oz" />
-        <child id="1199569916463" name="body" index="1bW5cS" />
-      </concept>
-    </language>
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl">
-      <concept id="8880393040217246788" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodParameterInstance" flags="ig" index="ffn8J">
-        <reference id="8880393040217294897" name="decl" index="ffrpq" />
-      </concept>
-      <concept id="3751132065236767083" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.DependentTypeInstance" flags="ig" index="q3mfm">
-        <reference id="3751132065236767084" name="decl" index="q3mfh" />
-        <reference id="9097849371505568270" name="point" index="1QQUv3" />
-      </concept>
-      <concept id="3751132065236767060" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodInstance" flags="ig" index="q3mfD">
-        <reference id="19209059688387895" name="decl" index="2VtyIY" />
-      </concept>
-      <concept id="6478870542308708689" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.PropertyInstance" flags="ig" index="3tT0cZ">
-        <reference id="8585153554445465961" name="decl" index="25KYV2" />
-      </concept>
-      <concept id="6478870542308703666" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MemberPlaceholder" flags="ng" index="3tTeZs">
-        <property id="6478870542308703667" name="caption" index="3tTeZt" />
-        <reference id="6478870542308703669" name="decl" index="3tTeZr" />
-      </concept>
-      <concept id="6478870542308871875" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.BooleanPropertyInstance" flags="ig" index="3tYpMH">
-        <property id="6478870542308871876" name="value" index="3tYpME" />
-      </concept>
-    </language>
-    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
-      <concept id="5455284157994012186" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitLink" flags="ng" index="2pIpSj">
-        <reference id="5455284157994012188" name="link" index="2pIpSl" />
-        <child id="1595412875168045827" name="initValue" index="28nt2d" />
-      </concept>
-      <concept id="5455284157993863837" name="jetbrains.mps.lang.quotation.structure.NodeBuilder" flags="nn" index="2pJPEk">
-        <child id="5455284157993863838" name="quotedNode" index="2pJPEn" />
-      </concept>
-      <concept id="5455284157993863840" name="jetbrains.mps.lang.quotation.structure.NodeBuilderNode" flags="nn" index="2pJPED">
-        <reference id="5455284157993910961" name="concept" index="2pJxaS" />
-        <child id="5455284157993911099" name="values" index="2pJxcM" />
-      </concept>
-      <concept id="8182547171709752110" name="jetbrains.mps.lang.quotation.structure.NodeBuilderExpression" flags="nn" index="36biLy">
-        <child id="8182547171709752112" name="expression" index="36biLW" />
-      </concept>
-    </language>
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
-        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
-      </concept>
-      <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
-      <concept id="1171323947159" name="jetbrains.mps.lang.smodel.structure.Model_NodesOperation" flags="nn" index="2SmgA7">
-        <child id="1758937410080001570" name="conceptArgument" index="1dBWTz" />
-      </concept>
-      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
-        <reference id="1138056516764" name="link" index="3Tt5mk" />
-      </concept>
-      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
-        <reference id="1138056546658" name="link" index="3TtcxE" />
-      </concept>
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-    <language id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration">
-      <concept id="8352104482584315555" name="jetbrains.mps.lang.migration.structure.MigrationScript" flags="ig" index="3SyAh_">
-        <property id="5820409521797704727" name="fromVersion" index="qMTe8" />
-      </concept>
-    </language>
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
-      <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
-        <child id="1204796294226" name="closure" index="23t8la" />
-      </concept>
-      <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
-        <child id="540871147943773366" name="argument" index="25WWJ7" />
-      </concept>
-      <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
-        <child id="1153944400369" name="variable" index="2Gsz3X" />
-        <child id="1153944424730" name="inputSequence" index="2GsD0m" />
-      </concept>
-      <concept id="1153944193378" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariable" flags="nr" index="2GrKxI" />
-      <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
-        <reference id="1153944258490" name="variable" index="2Gs0qQ" />
-      </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
-      <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
-    </language>
-  </registry>
-  <node concept="3SyAh_" id="6W1kQP6ANzM">
-    <property role="qMTe8" value="0" />
-    <property role="TrG5h" value="migrateHazardRefInFSR" />
-    <node concept="3Tm1VV" id="6W1kQP6ANzN" role="1B3o_S" />
-    <node concept="3tTeZs" id="6W1kQP6ANzO" role="jymVt">
-      <property role="3tTeZt" value="&lt;no execute after&gt;" />
-      <ref role="3tTeZr" to="slm6:7ay_HjIMt1a" resolve="execute after" />
-    </node>
-    <node concept="3tTeZs" id="6W1kQP6ANzP" role="jymVt">
-      <property role="3tTeZt" value="&lt;no required data&gt;" />
-      <ref role="3tTeZr" to="slm6:5TUCQr2FPTh" resolve="requires annotation data" />
-    </node>
-    <node concept="3tTeZs" id="6W1kQP6ANzQ" role="jymVt">
-      <property role="3tTeZt" value="&lt;no produced data&gt;" />
-      <ref role="3tTeZr" to="slm6:5TUCQr2C271" resolve="produces annotation data" />
-    </node>
-    <node concept="2tJIrI" id="6W1kQP6ANzR" role="jymVt" />
-    <node concept="3tYpMH" id="6W1kQP6ANzS" role="jymVt">
-      <property role="TrG5h" value="isRerunnable" />
-      <property role="3tYpME" value="true" />
-      <ref role="25KYV2" to="slm6:1JWcQ2VeWIs" resolve="isRerunnable" />
-      <node concept="3Tm1VV" id="6W1kQP6ANzT" role="1B3o_S" />
-      <node concept="10P_77" id="6W1kQP6ANzU" role="1tU5fm" />
-    </node>
-    <node concept="3tTeZs" id="6W1kQP6ANzV" role="jymVt">
-      <property role="3tTeZt" value="&lt;description&gt;" />
-      <ref role="3tTeZr" to="slm6:1_lSsE3RFpE" resolve="description" />
-    </node>
-    <node concept="q3mfD" id="6W1kQP6ANzW" role="jymVt">
-      <property role="TrG5h" value="execute" />
-      <ref role="2VtyIY" to="slm6:4ubqdNOF9cA" resolve="execute" />
-      <node concept="3Tm1VV" id="6W1kQP6ANzY" role="1B3o_S" />
-      <node concept="3clFbS" id="6W1kQP6AN$0" role="3clF47">
-        <node concept="2Gpval" id="6W1kQP6AP_P" role="3cqZAp">
-          <node concept="2GrKxI" id="6W1kQP6AP_R" role="2Gsz3X">
-            <property role="TrG5h" value="crtModel" />
-          </node>
-          <node concept="2OqwBi" id="6W1kQP6APO$" role="2GsD0m">
-            <node concept="37vLTw" id="6W1kQP6APGX" role="2Oq$k0">
-              <ref role="3cqZAo" node="6W1kQP6AN$2" resolve="m" />
-            </node>
-            <node concept="liA8E" id="6W1kQP6APYu" role="2OqNvi">
-              <ref role="37wK5l" to="lui2:~SModule.getModels()" resolve="getModels" />
-            </node>
-          </node>
-          <node concept="3clFbS" id="6W1kQP6AP_V" role="2LFqv$">
-            <node concept="3cpWs8" id="6W1kQP6AQkJ" role="3cqZAp">
-              <node concept="3cpWsn" id="6W1kQP6AQkM" role="3cpWs9">
-                <property role="TrG5h" value="mm" />
-                <node concept="H_c77" id="6W1kQP6AQkI" role="1tU5fm" />
-                <node concept="2GrUjf" id="6W1kQP6AQmw" role="33vP2m">
-                  <ref role="2Gs0qQ" node="6W1kQP6AP_R" resolve="crtModel" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="6W1kQP6AQrK" role="3cqZAp">
-              <node concept="2OqwBi" id="6W1kQP6ASIf" role="3clFbG">
-                <node concept="2OqwBi" id="6W1kQP6AQ_U" role="2Oq$k0">
-                  <node concept="37vLTw" id="6W1kQP6AQrI" role="2Oq$k0">
-                    <ref role="3cqZAo" node="6W1kQP6AQkM" resolve="mm" />
-                  </node>
-                  <node concept="2SmgA7" id="6W1kQP6AQHv" role="2OqNvi">
-                    <node concept="chp4Y" id="6W1kQP6AQTV" role="1dBWTz">
-                      <ref role="cht4Q" to="30zx:5r2fDr4pukE" resolve="FunctionalSafetyReqKind" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="2es0OD" id="6W1kQP6AUOg" role="2OqNvi">
-                  <node concept="1bVj0M" id="6W1kQP6AUOi" role="23t8la">
-                    <node concept="3clFbS" id="6W1kQP6AUOj" role="1bW5cS">
-                      <node concept="3clFbF" id="6W1kQP6AUVd" role="3cqZAp">
-                        <node concept="2OqwBi" id="6W1kQP6AX9n" role="3clFbG">
-                          <node concept="2OqwBi" id="6W1kQP6AV5m" role="2Oq$k0">
-                            <node concept="37vLTw" id="6W1kQP6AUVc" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6W1kQP6AUOk" resolve="it" />
-                            </node>
-                            <node concept="3Tsc0h" id="6W1kQP6AVmm" role="2OqNvi">
-                              <ref role="3TtcxE" to="30zx:6W1kQP6AMYT" resolve="hazards" />
-                            </node>
-                          </node>
-                          <node concept="TSZUe" id="6W1kQP6AZmt" role="2OqNvi">
-                            <node concept="2pJPEk" id="6W1kQP6B0WG" role="25WWJ7">
-                              <node concept="2pJPED" id="6W1kQP6B1a_" role="2pJPEn">
-                                <ref role="2pJxaS" to="cjwq:6W1kQP6AMY_" resolve="HazardRef" />
-                                <node concept="2pIpSj" id="6W1kQP6B1uI" role="2pJxcM">
-                                  <ref role="2pIpSl" to="cjwq:6W1kQP6AMYA" resolve="hazard" />
-                                  <node concept="36biLy" id="6W1kQP6B1EQ" role="28nt2d">
-                                    <node concept="2OqwBi" id="6W1kQP6B57A" role="36biLW">
-                                      <node concept="37vLTw" id="6W1kQP6B4LH" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="6W1kQP6AUOk" resolve="it" />
-                                      </node>
-                                      <node concept="3TrEf2" id="6W1kQP6B5yC" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="30zx:7L33HENbhhH" resolve="hazard" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbF" id="6W1kQP6B67P" role="3cqZAp">
-                        <node concept="37vLTI" id="6W1kQP6B8sO" role="3clFbG">
-                          <node concept="10Nm6u" id="6W1kQP6B8BP" role="37vLTx" />
-                          <node concept="2OqwBi" id="6W1kQP6B6oN" role="37vLTJ">
-                            <node concept="37vLTw" id="6W1kQP6B67N" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6W1kQP6AUOk" resolve="it" />
-                            </node>
-                            <node concept="3TrEf2" id="6W1kQP6B6LU" role="2OqNvi">
-                              <ref role="3Tt5mk" to="30zx:7L33HENbhhH" resolve="hazard" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="Rh6nW" id="6W1kQP6AUOk" role="1bW2Oz">
-                      <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6W1kQP6AUOl" role="1tU5fm" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="ffn8J" id="6W1kQP6AN$2" role="3clF46">
-        <property role="TrG5h" value="m" />
-        <ref role="ffrpq" to="slm6:7fCCGqboj9J" resolve="m" />
-        <node concept="3uibUv" id="6W1kQP6AN$1" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
-        </node>
-      </node>
-      <node concept="q3mfm" id="6W1kQP6AN$3" role="3clF45">
-        <ref role="q3mfh" to="slm6:4F5w8gPXEEe" />
-        <ref role="1QQUv3" node="6W1kQP6ANzW" resolve="execute" />
-      </node>
-    </node>
-    <node concept="3tTeZs" id="6W1kQP6AN$4" role="jymVt">
-      <property role="3tTeZt" value="&lt;no result checking&gt;" />
-      <ref role="3tTeZr" to="slm6:1JWcQ2VeXpD" resolve="check" />
-    </node>
-    <node concept="3uibUv" id="6W1kQP6AN$5" role="1zkMxy">
-      <ref role="3uigEE" to="slm6:5TUCQr2ybBO" resolve="HasMigrationScriptReference" />
-    </node>
-  </node>
+  <registry />
 </model>
 
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.structure.mps
index b9405f369..0d25ae50d 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.structure.mps
@@ -21,7 +21,6 @@
         <reference id="1075010451642646892" name="defaultMember" index="1H5jkz" />
         <child id="3348158742936976577" name="members" index="25R1y" />
       </concept>
-      <concept id="1224240836180" name="jetbrains.mps.lang.structure.structure.DeprecatedNodeAnnotation" flags="ig" index="asaX9" />
       <concept id="1082978164218" name="jetbrains.mps.lang.structure.structure.DataTypeDeclaration" flags="ng" index="AxPO6">
         <property id="7791109065626895363" name="datatypeId" index="3F6X1D" />
       </concept>
@@ -48,9 +47,6 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
-      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
@@ -62,12 +58,6 @@
     <property role="34LRSv" value="functional safety" />
     <property role="R4oN_" value="functional safety requirement" />
     <ref role="1TJDcQ" to="z27p:4gtLUSMLiPT" resolve="ReqKindBase" />
-    <node concept="1TJgyj" id="7L33HENbhhH" role="1TKVEi">
-      <property role="IQ2ns" value="8954016816614413421" />
-      <property role="20kJfa" value="hazard" />
-      <ref role="20lvS9" to="cjwq:7TjUbLQ451K" resolve="Hazard" />
-      <node concept="asaX9" id="6W1kQP6ANzK" role="lGtFl" />
-    </node>
     <node concept="1TJgyj" id="6W1kQP6AMYT" role="1TKVEi">
       <property role="IQ2ns" value="7998766141987827641" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/com.mbeddr.formal.safety.stamp.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/com.mbeddr.formal.safety.stamp.mpl
index 90ad62724..2f8d6b7e4 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/com.mbeddr.formal.safety.stamp.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/com.mbeddr.formal.safety.stamp.mpl
@@ -85,6 +85,7 @@
     <module reference="e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)" version="0" />
     <module reference="17da266c-02d9-4bbd-b69b-8a656b49f45c(com.mbeddr.formal.safety.hara)" version="0" />
     <module reference="7e777b53-0a6b-4719-b36d-10475788d49f(com.mbeddr.formal.safety.stamp)" version="0" />
+    <module reference="6b84fb9e-5f09-4a61-bf31-3bfdc54820e3(com.mpsbasics.editor.utils)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="7b45fa94-2707-4a1a-9e6a-ce40c4aaf35a(de.itemis.mps.editor.collapsible.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.editor.mps
index 6ed187953..342dda93f 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.editor.mps
@@ -26,7 +26,6 @@
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" implicit="true" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
-    <import index="cjwq" ref="r:7e1f4da1-19b3-4ceb-bcab-0237eb7a50b7(com.mbeddr.formal.safety.hara.structure)" implicit="true" />
     <import index="a6vc" ref="r:e6f4512f-409a-4a84-b8a1-33fc1cc8fd1f(com.mbeddr.formal.safety.stamp.behavior)" implicit="true" />
   </imports>
   <registry>
@@ -432,8 +431,6 @@
         <reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
       </concept>
       <concept id="6677504323281689838" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3bZ5Sz" />
-      <concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
-      <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
       <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
         <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
       </concept>
@@ -1505,148 +1502,6 @@
             </node>
           </node>
         </node>
-        <node concept="2reCLy" id="1JhvKLLOa1k" role="2reCL6">
-          <node concept="3F2HdR" id="_wUu$U6xjS" role="2reSmM">
-            <ref role="1NtTu8" to="bewr:1JhvKLLO9K1" resolve="notProviding" />
-            <ref role="1k5W1q" node="3x7uzC8qOMR" resolve="uca_style" />
-            <node concept="2iRkQZ" id="_wUu$U6xjU" role="2czzBx" />
-            <node concept="3F0ifn" id="_wUu$U7zYa" role="2czzBI">
-              <property role="3F0ifm" value="ToDo" />
-              <ref role="1k5W1q" to="xnej:_wUu$U7_Lc" resolve="FASTENUserHint" />
-            </node>
-          </node>
-          <node concept="1A0rlU" id="3x7uzC8rcLF" role="2recC9">
-            <node concept="3F0ifn" id="3x7uzC8rcLN" role="1A0rbF">
-              <property role="3F0ifm" value="Not Providing Causes Hazard" />
-              <ref role="1k5W1q" node="3x7uzC8qOMR" resolve="uca_style" />
-            </node>
-          </node>
-          <node concept="3NQdyq" id="2ynKV3B$pHg" role="3NQet$">
-            <node concept="3clFbS" id="2ynKV3B$pHh" role="2VODD2">
-              <node concept="3clFbF" id="2ynKV3B$pLb" role="3cqZAp">
-                <node concept="2OqwBi" id="2ynKV3B$rTQ" role="3clFbG">
-                  <node concept="2OqwBi" id="2ynKV3B$pYt" role="2Oq$k0">
-                    <node concept="2r2w_c" id="2ynKV3B$pLa" role="2Oq$k0" />
-                    <node concept="3Tsc0h" id="2ynKV3B$qgR" role="2OqNvi">
-                      <ref role="3TtcxE" to="bewr:1JhvKLLO9K1" resolve="notProviding" />
-                    </node>
-                  </node>
-                  <node concept="3GX2aA" id="2ynKV3B$uou" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2reCLy" id="1JhvKLLOa1I" role="2reCL6">
-          <node concept="1A0rlU" id="3x7uzC8rcLS" role="2recC9">
-            <node concept="3F0ifn" id="3x7uzC8rcM0" role="1A0rbF">
-              <property role="3F0ifm" value="Providing Causes Hazard" />
-              <ref role="1k5W1q" node="3x7uzC8qOMR" resolve="uca_style" />
-            </node>
-          </node>
-          <node concept="3F2HdR" id="_wUu$U6xjZ" role="2reSmM">
-            <ref role="1NtTu8" to="bewr:1JhvKLLOa0Y" resolve="providing" />
-            <ref role="1k5W1q" node="3x7uzC8qOMR" resolve="uca_style" />
-            <node concept="2iRkQZ" id="_wUu$U6xk0" role="2czzBx" />
-            <node concept="3F0ifn" id="_wUu$U7S10" role="2czzBI">
-              <property role="3F0ifm" value="ToDo" />
-              <ref role="1k5W1q" to="xnej:_wUu$U7_Lc" resolve="FASTENUserHint" />
-            </node>
-          </node>
-          <node concept="3NQdyq" id="2ynKV3B$utd" role="3NQet$">
-            <node concept="3clFbS" id="2ynKV3B$ute" role="2VODD2">
-              <node concept="3clFbF" id="2ynKV3B$ux8" role="3cqZAp">
-                <node concept="2OqwBi" id="2ynKV3B$w$4" role="3clFbG">
-                  <node concept="2OqwBi" id="2ynKV3B$uIq" role="2Oq$k0">
-                    <node concept="2r2w_c" id="2ynKV3B$ux7" role="2Oq$k0" />
-                    <node concept="3Tsc0h" id="2ynKV3B$uXh" role="2OqNvi">
-                      <ref role="3TtcxE" to="bewr:1JhvKLLOa0Y" resolve="providing" />
-                    </node>
-                  </node>
-                  <node concept="3GX2aA" id="2ynKV3B$$SH" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2reCLy" id="1JhvKLLOa2e" role="2reCL6">
-          <node concept="1A0rlU" id="3x7uzC8rcM5" role="2recC9">
-            <node concept="3EZMnI" id="3x7uzC8ryvr" role="1A0rbF">
-              <node concept="2iRkQZ" id="3x7uzC8ryvs" role="2iSdaV" />
-              <node concept="3F0ifn" id="3x7uzC8rcMd" role="3EZMnx">
-                <property role="3F0ifm" value="Too Soon/Late," />
-                <ref role="1k5W1q" node="3x7uzC8qOMR" resolve="uca_style" />
-              </node>
-              <node concept="3F0ifn" id="3x7uzC8ryv_" role="3EZMnx">
-                <property role="3F0ifm" value="Out of Sequence" />
-                <ref role="1k5W1q" node="3x7uzC8qOMR" resolve="uca_style" />
-              </node>
-            </node>
-          </node>
-          <node concept="3F2HdR" id="_wUu$U6xk8" role="2reSmM">
-            <ref role="1NtTu8" to="bewr:1JhvKLLOa12" resolve="soonLateOutOfSequence" />
-            <ref role="1k5W1q" node="3x7uzC8qOMR" resolve="uca_style" />
-            <node concept="2iRkQZ" id="_wUu$U6xk9" role="2czzBx" />
-            <node concept="3F0ifn" id="_wUu$U7S13" role="2czzBI">
-              <property role="3F0ifm" value="ToDo" />
-              <ref role="1k5W1q" to="xnej:_wUu$U7_Lc" resolve="FASTENUserHint" />
-            </node>
-          </node>
-          <node concept="3NQdyq" id="2ynKV3B$_2V" role="3NQet$">
-            <node concept="3clFbS" id="2ynKV3B$_2W" role="2VODD2">
-              <node concept="3clFbF" id="2ynKV3B$_3j" role="3cqZAp">
-                <node concept="2OqwBi" id="2ynKV3B$BnS" role="3clFbG">
-                  <node concept="2OqwBi" id="2ynKV3B$_g_" role="2Oq$k0">
-                    <node concept="2r2w_c" id="2ynKV3B$_3i" role="2Oq$k0" />
-                    <node concept="3Tsc0h" id="2ynKV3B$_vs" role="2OqNvi">
-                      <ref role="3TtcxE" to="bewr:1JhvKLLOa12" resolve="soonLateOutOfSequence" />
-                    </node>
-                  </node>
-                  <node concept="3GX2aA" id="2ynKV3B$DVZ" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2reCLy" id="1JhvKLLOa2O" role="2reCL6">
-          <node concept="1A0rlU" id="3x7uzC8rcMi" role="2recC9">
-            <node concept="3EZMnI" id="3x7uzC8ryvE" role="1A0rbF">
-              <node concept="2iRkQZ" id="3x7uzC8ryvF" role="2iSdaV" />
-              <node concept="3F0ifn" id="3x7uzC8rcMq" role="3EZMnx">
-                <property role="3F0ifm" value="Stopped too Soon," />
-                <ref role="1k5W1q" node="3x7uzC8qOMR" resolve="uca_style" />
-              </node>
-              <node concept="3F0ifn" id="3x7uzC8ryvO" role="3EZMnx">
-                <property role="3F0ifm" value="Applied too Long" />
-                <ref role="1k5W1q" node="3x7uzC8qOMR" resolve="uca_style" />
-              </node>
-            </node>
-          </node>
-          <node concept="3F2HdR" id="_wUu$U6xkh" role="2reSmM">
-            <ref role="1NtTu8" to="bewr:1JhvKLLOa17" resolve="stoppedTooSoonAppliedTooLong" />
-            <ref role="1k5W1q" node="3x7uzC8qOMR" resolve="uca_style" />
-            <node concept="2iRkQZ" id="_wUu$U6xkj" role="2czzBx" />
-            <node concept="3F0ifn" id="_wUu$U7S16" role="2czzBI">
-              <property role="3F0ifm" value="ToDo" />
-              <ref role="1k5W1q" to="xnej:_wUu$U7_Lc" resolve="FASTENUserHint" />
-            </node>
-          </node>
-          <node concept="3NQdyq" id="2ynKV3B$E0I" role="3NQet$">
-            <node concept="3clFbS" id="2ynKV3B$E0J" role="2VODD2">
-              <node concept="3clFbF" id="2ynKV3B$E0O" role="3cqZAp">
-                <node concept="2OqwBi" id="2ynKV3B$GaN" role="3clFbG">
-                  <node concept="2OqwBi" id="2ynKV3B$Ee3" role="2Oq$k0">
-                    <node concept="2r2w_c" id="2ynKV3B$E0N" role="2Oq$k0" />
-                    <node concept="3Tsc0h" id="2ynKV3B$Ewt" role="2OqNvi">
-                      <ref role="3TtcxE" to="bewr:1JhvKLLOa17" resolve="stoppedTooSoonAppliedTooLong" />
-                    </node>
-                  </node>
-                  <node concept="3GX2aA" id="2ynKV3B$IFn" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
       </node>
     </node>
   </node>
@@ -1677,48 +1532,6 @@
           <property role="2czwfO" value="," />
           <ref role="1NtTu8" to="bewr:1TjUjQRQU01" resolve="hazards" />
           <node concept="2iRfu4" id="1TjUjQRR5$_" role="2czzBx" />
-          <node concept="pkWqt" id="1TjUjQRR5L4" role="pqm2j">
-            <node concept="3clFbS" id="1TjUjQRR5L5" role="2VODD2">
-              <node concept="3clFbF" id="1TjUjQRR5P1" role="3cqZAp">
-                <node concept="2OqwBi" id="1TjUjQRR6Ib" role="3clFbG">
-                  <node concept="2OqwBi" id="1TjUjQRR65j" role="2Oq$k0">
-                    <node concept="pncrf" id="1TjUjQRR5P0" role="2Oq$k0" />
-                    <node concept="3TrEf2" id="1TjUjQRR6tu" role="2OqNvi">
-                      <ref role="3Tt5mk" to="bewr:6RZi9ii$cW_" resolve="hazard" />
-                    </node>
-                  </node>
-                  <node concept="3w_OXm" id="1TjUjQRR7Lv" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1iCGBv" id="_wUu$U7f7o" role="3EZMnx">
-          <ref role="1NtTu8" to="bewr:6RZi9ii$cW_" resolve="hazard" />
-          <node concept="1sVBvm" id="_wUu$U7f7p" role="1sWHZn">
-            <node concept="3F0A7n" id="_wUu$U7f7q" role="2wV5jI">
-              <property role="1Intyy" value="true" />
-              <ref role="1NtTu8" to="cjwq:2N7iSwG$CrI" resolve="id" />
-            </node>
-          </node>
-          <node concept="VechU" id="_wUu$U7f7r" role="3F10Kt">
-            <property role="Vb096" value="g1_eI4o/darkBlue" />
-          </node>
-          <node concept="pkWqt" id="1TjUjQRQU09" role="pqm2j">
-            <node concept="3clFbS" id="1TjUjQRQU0a" role="2VODD2">
-              <node concept="3clFbF" id="1TjUjQRR0Z5" role="3cqZAp">
-                <node concept="2OqwBi" id="1TjUjQRR3a9" role="3clFbG">
-                  <node concept="2OqwBi" id="1TjUjQRR1Mt" role="2Oq$k0">
-                    <node concept="pncrf" id="1TjUjQRR0Z4" role="2Oq$k0" />
-                    <node concept="3TrEf2" id="1TjUjQRR2sy" role="2OqNvi">
-                      <ref role="3Tt5mk" to="bewr:6RZi9ii$cW_" resolve="hazard" />
-                    </node>
-                  </node>
-                  <node concept="3x8VRR" id="1TjUjQRR4n6" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
         </node>
         <node concept="3F0ifn" id="_wUu$U7f7s" role="3EZMnx">
           <property role="3F0ifm" value="]" />
@@ -2817,17 +2630,9 @@
   <node concept="PKFIW" id="4bL3rTRKGk4">
     <property role="TrG5h" value="FunctionalControlStructureTextualView" />
     <ref role="1XX52x" to="bewr:3HVC1H6VUjH" resolve="FunctionalControlStructure" />
-    <node concept="3EZMnI" id="4bL3rTRKGkg" role="2wV5jI">
-      <node concept="3F2HdR" id="4bL3rTRE8bE" role="3EZMnx">
-        <ref role="1NtTu8" to="bewr:3HVC1H6VUGW" resolve="content" />
-        <node concept="2iRkQZ" id="4bL3rTRE8bG" role="2czzBx" />
-      </node>
-      <node concept="3F0ifn" id="4bL3rTRFUgZ" role="3EZMnx" />
-      <node concept="3F2HdR" id="4bL3rTRFUhc" role="3EZMnx">
-        <ref role="1NtTu8" to="bewr:3HVC1H6VUGY" resolve="connections" />
-        <node concept="2iRkQZ" id="4bL3rTRFUhe" role="2czzBx" />
-      </node>
-      <node concept="2iRkQZ" id="4bL3rTRKGkj" role="2iSdaV" />
+    <node concept="3F2HdR" id="4bL3rTRE8bE" role="2wV5jI">
+      <ref role="1NtTu8" to="bewr:3HVC1H6VUGW" resolve="content" />
+      <node concept="2iRkQZ" id="4bL3rTRE8bG" role="2czzBx" />
     </node>
   </node>
   <node concept="PKFIW" id="4bL3rTRLkfr">
@@ -2850,18 +2655,6 @@
           </node>
         </node>
       </node>
-      <node concept="2ZMM4L" id="2ccN23oaEm7" role="aCds2">
-        <node concept="3clFbS" id="2ccN23oaEm9" role="2VODD2">
-          <node concept="3clFbF" id="2ccN23oaEvh" role="3cqZAp">
-            <node concept="2OqwBi" id="2ccN23oaEGj" role="3clFbG">
-              <node concept="2ZN8Hh" id="2ccN23oaEvg" role="2Oq$k0" />
-              <node concept="3Tsc0h" id="3HVC1H6X6I1" role="2OqNvi">
-                <ref role="3TtcxE" to="bewr:3HVC1H6VUGY" resolve="connections" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
       <node concept="1xLmZY" id="71RA3dHA7vZ" role="1xLlFP">
         <node concept="3clFbS" id="71RA3dHA7w1" role="2VODD2">
           <node concept="3clFbF" id="7kF4CZH_nP3" role="3cqZAp">
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.migration.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.migration.mps
index 2d857e785..6a4b67953 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.migration.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.migration.mps
@@ -14,982 +14,7 @@
     <import index="slm6" ref="90746344-04fd-4286-97d5-b46ae6a81709/r:52a3d974-bd4f-4651-ba6e-a2de5e336d95(jetbrains.mps.lang.migration/jetbrains.mps.lang.migration.methods)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="bewr" ref="r:a5d87024-d7b0-459e-b0ec-a9c089196f41(com.mbeddr.formal.safety.stamp.structure)" />
-    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
-  <registry>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
-        <child id="1068498886297" name="rValue" index="37vLTx" />
-        <child id="1068498886295" name="lValue" index="37vLTJ" />
-      </concept>
-      <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
-      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
-      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
-      <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
-        <child id="1154032183016" name="body" index="2LFqv$" />
-      </concept>
-      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
-        <child id="1197027771414" name="operand" index="2Oq$k0" />
-        <child id="1197027833540" name="operation" index="2OqNvi" />
-      </concept>
-      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
-        <property id="1070475926801" name="value" index="Xl_RC" />
-      </concept>
-      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
-      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
-        <child id="1165602531693" name="superclass" index="1zkMxy" />
-      </concept>
-      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
-        <child id="1068431790190" name="initializer" index="33vP2m" />
-      </concept>
-      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
-        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
-      </concept>
-      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
-      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
-      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
-        <child id="5680397130376446158" name="type" index="1tU5fm" />
-      </concept>
-      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
-        <child id="1068580123133" name="returnType" index="3clF45" />
-        <child id="1068580123134" name="parameter" index="3clF46" />
-        <child id="1068580123135" name="body" index="3clF47" />
-      </concept>
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </concept>
-      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
-      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
-        <child id="1068580123160" name="condition" index="3clFbw" />
-        <child id="1068580123161" name="ifTrue" index="3clFbx" />
-      </concept>
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
-        <child id="1068581517665" name="statement" index="3cqZAp" />
-      </concept>
-      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
-        <property id="1068580123138" name="value" index="3clFbU" />
-      </concept>
-      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
-        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
-      </concept>
-      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
-        <child id="1081516765348" name="expression" index="3fr31v" />
-      </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
-        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
-        <child id="1068499141038" name="actualArgument" index="37wK5m" />
-      </concept>
-      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
-        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
-      </concept>
-      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
-      </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
-        <child id="1178549979242" name="visibility" index="1B3o_S" />
-      </concept>
-      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
-    </language>
-    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
-      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
-        <child id="1199569906740" name="parameter" index="1bW2Oz" />
-        <child id="1199569916463" name="body" index="1bW5cS" />
-      </concept>
-    </language>
-    <language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl">
-      <concept id="8880393040217246788" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodParameterInstance" flags="ig" index="ffn8J">
-        <reference id="8880393040217294897" name="decl" index="ffrpq" />
-      </concept>
-      <concept id="3751132065236767083" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.DependentTypeInstance" flags="ig" index="q3mfm">
-        <reference id="3751132065236767084" name="decl" index="q3mfh" />
-        <reference id="9097849371505568270" name="point" index="1QQUv3" />
-      </concept>
-      <concept id="3751132065236767060" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MethodInstance" flags="ig" index="q3mfD">
-        <reference id="19209059688387895" name="decl" index="2VtyIY" />
-      </concept>
-      <concept id="6478870542308708689" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.PropertyInstance" flags="ig" index="3tT0cZ">
-        <reference id="8585153554445465961" name="decl" index="25KYV2" />
-      </concept>
-      <concept id="6478870542308703666" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.MemberPlaceholder" flags="ng" index="3tTeZs">
-        <property id="6478870542308703667" name="caption" index="3tTeZt" />
-        <reference id="6478870542308703669" name="decl" index="3tTeZr" />
-      </concept>
-      <concept id="6478870542308871875" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.BooleanPropertyInstance" flags="ig" index="3tYpMH">
-        <property id="6478870542308871876" name="value" index="3tYpME" />
-      </concept>
-      <concept id="6478870542308871428" name="jetbrains.mps.baseLanguage.lightweightdsl.structure.StringPropertyInstance" flags="ig" index="3tYpXE">
-        <property id="6478870542308871429" name="value" index="3tYpXF" />
-      </concept>
-    </language>
-    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
-      <concept id="5455284157994012186" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitLink" flags="ng" index="2pIpSj">
-        <reference id="5455284157994012188" name="link" index="2pIpSl" />
-        <child id="1595412875168045827" name="initValue" index="28nt2d" />
-      </concept>
-      <concept id="5455284157993911077" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitProperty" flags="ng" index="2pJxcG">
-        <reference id="5455284157993911078" name="property" index="2pJxcJ" />
-        <child id="1595412875168045201" name="initValue" index="28ntcv" />
-      </concept>
-      <concept id="5455284157993863837" name="jetbrains.mps.lang.quotation.structure.NodeBuilder" flags="nn" index="2pJPEk">
-        <child id="5455284157993863838" name="quotedNode" index="2pJPEn" />
-      </concept>
-      <concept id="5455284157993863840" name="jetbrains.mps.lang.quotation.structure.NodeBuilderNode" flags="nn" index="2pJPED">
-        <reference id="5455284157993910961" name="concept" index="2pJxaS" />
-        <child id="5455284157993911099" name="values" index="2pJxcM" />
-      </concept>
-      <concept id="8182547171709738802" name="jetbrains.mps.lang.quotation.structure.NodeBuilderList" flags="nn" index="36be1Y" />
-    </language>
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
-        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
-      </concept>
-      <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
-        <child id="1144104376918" name="parameter" index="1xVPHs" />
-      </concept>
-      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
-        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
-        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
-      </concept>
-      <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
-      <concept id="1171315804604" name="jetbrains.mps.lang.smodel.structure.Model_RootsOperation" flags="nn" index="2RRcyG">
-        <child id="6750920497477046361" name="conceptArgument" index="3MHsoP" />
-      </concept>
-      <concept id="1171323947159" name="jetbrains.mps.lang.smodel.structure.Model_NodesOperation" flags="nn" index="2SmgA7">
-        <child id="1758937410080001570" name="conceptArgument" index="1dBWTz" />
-      </concept>
-      <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
-      <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
-        <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
-      </concept>
-      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
-      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
-        <reference id="1138405853777" name="concept" index="ehGHo" />
-      </concept>
-      <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
-        <reference id="1138056395725" name="property" index="3TsBF5" />
-      </concept>
-      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
-        <reference id="1138056516764" name="link" index="3Tt5mk" />
-      </concept>
-      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
-        <reference id="1138056546658" name="link" index="3TtcxE" />
-      </concept>
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-    <language id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration">
-      <concept id="8352104482584315555" name="jetbrains.mps.lang.migration.structure.MigrationScript" flags="ig" index="3SyAh_">
-        <property id="5820409521797704727" name="fromVersion" index="qMTe8" />
-      </concept>
-    </language>
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
-      <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
-        <child id="1204796294226" name="closure" index="23t8la" />
-      </concept>
-      <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
-        <child id="540871147943773366" name="argument" index="25WWJ7" />
-      </concept>
-      <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
-      <concept id="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
-        <child id="1153944400369" name="variable" index="2Gsz3X" />
-        <child id="1153944424730" name="inputSequence" index="2GsD0m" />
-      </concept>
-      <concept id="1153944193378" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariable" flags="nr" index="2GrKxI" />
-      <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
-        <reference id="1153944258490" name="variable" index="2Gs0qQ" />
-      </concept>
-      <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
-      <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
-    </language>
-  </registry>
-  <node concept="3SyAh_" id="1FMyjUP84sj">
-    <property role="qMTe8" value="0" />
-    <property role="TrG5h" value="moveConnectionsFromControlStructureToTheirSources" />
-    <node concept="3Tm1VV" id="1FMyjUP84sk" role="1B3o_S" />
-    <node concept="3tTeZs" id="1FMyjUP84sl" role="jymVt">
-      <property role="3tTeZt" value="&lt;no execute after&gt;" />
-      <ref role="3tTeZr" to="slm6:7ay_HjIMt1a" resolve="execute after" />
-    </node>
-    <node concept="3tTeZs" id="1FMyjUP84sm" role="jymVt">
-      <property role="3tTeZt" value="&lt;no required data&gt;" />
-      <ref role="3tTeZr" to="slm6:5TUCQr2FPTh" resolve="requires annotation data" />
-    </node>
-    <node concept="3tTeZs" id="1FMyjUP84sn" role="jymVt">
-      <property role="3tTeZt" value="&lt;no produced data&gt;" />
-      <ref role="3tTeZr" to="slm6:5TUCQr2C271" resolve="produces annotation data" />
-    </node>
-    <node concept="2tJIrI" id="1FMyjUP84so" role="jymVt" />
-    <node concept="3tYpMH" id="1FMyjUP84sp" role="jymVt">
-      <property role="TrG5h" value="isRerunnable" />
-      <property role="3tYpME" value="true" />
-      <ref role="25KYV2" to="slm6:1JWcQ2VeWIs" resolve="isRerunnable" />
-      <node concept="3Tm1VV" id="1FMyjUP84sq" role="1B3o_S" />
-      <node concept="10P_77" id="1FMyjUP84sr" role="1tU5fm" />
-    </node>
-    <node concept="3tYpXE" id="1FMyjUP84wi" role="jymVt">
-      <property role="TrG5h" value="description" />
-      <property role="3tYpXF" value="STPA: Migrate Connections in Control Structure" />
-      <ref role="25KYV2" to="slm6:1_lSsE3RFpE" resolve="description" />
-      <node concept="3Tm1VV" id="1FMyjUP84wk" role="1B3o_S" />
-      <node concept="17QB3L" id="1FMyjUP84wl" role="1tU5fm" />
-    </node>
-    <node concept="q3mfD" id="1FMyjUP84st" role="jymVt">
-      <property role="TrG5h" value="execute" />
-      <ref role="2VtyIY" to="slm6:4ubqdNOF9cA" resolve="execute" />
-      <node concept="3Tm1VV" id="1FMyjUP84sv" role="1B3o_S" />
-      <node concept="3clFbS" id="1FMyjUP84sx" role="3clF47">
-        <node concept="2Gpval" id="1FMyjUP85Fa" role="3cqZAp">
-          <node concept="2GrKxI" id="1FMyjUP85Ff" role="2Gsz3X">
-            <property role="TrG5h" value="mod" />
-          </node>
-          <node concept="3clFbS" id="1FMyjUP85Fp" role="2LFqv$">
-            <node concept="3cpWs8" id="1FMyjUP85RR" role="3cqZAp">
-              <node concept="3cpWsn" id="1FMyjUP85RU" role="3cpWs9">
-                <property role="TrG5h" value="crtModel" />
-                <node concept="H_c77" id="1FMyjUP85RQ" role="1tU5fm" />
-                <node concept="2GrUjf" id="1FMyjUP85WE" role="33vP2m">
-                  <ref role="2Gs0qQ" node="1FMyjUP85Ff" resolve="mod" />
-                </node>
-              </node>
-            </node>
-            <node concept="2Gpval" id="1FMyjUP87l3" role="3cqZAp">
-              <node concept="2GrKxI" id="1FMyjUP87l8" role="2Gsz3X">
-                <property role="TrG5h" value="fcs" />
-              </node>
-              <node concept="3clFbS" id="1FMyjUP87li" role="2LFqv$">
-                <node concept="2Gpval" id="1FMyjUP8gny" role="3cqZAp">
-                  <node concept="2GrKxI" id="1FMyjUP8gn$" role="2Gsz3X">
-                    <property role="TrG5h" value="conn" />
-                  </node>
-                  <node concept="2OqwBi" id="1FMyjUP8gtP" role="2GsD0m">
-                    <node concept="2GrUjf" id="1FMyjUP8gpm" role="2Oq$k0">
-                      <ref role="2Gs0qQ" node="1FMyjUP87l8" resolve="fcs" />
-                    </node>
-                    <node concept="3Tsc0h" id="1FMyjUP8gDE" role="2OqNvi">
-                      <ref role="3TtcxE" to="bewr:3HVC1H6VUGY" resolve="connections" />
-                    </node>
-                  </node>
-                  <node concept="3clFbS" id="1FMyjUP8gnC" role="2LFqv$">
-                    <node concept="3clFbF" id="1FMyjUP8gKG" role="3cqZAp">
-                      <node concept="2OqwBi" id="1FMyjUP8jur" role="3clFbG">
-                        <node concept="2OqwBi" id="1FMyjUP8hPq" role="2Oq$k0">
-                          <node concept="1PxgMI" id="1FMyjUP8hHv" role="2Oq$k0">
-                            <node concept="chp4Y" id="1FMyjUP8hJj" role="3oSUPX">
-                              <ref role="cht4Q" to="bewr:3HVC1H6Wlax" resolve="Controller" />
-                            </node>
-                            <node concept="2OqwBi" id="1FMyjUP8gSR" role="1m5AlR">
-                              <node concept="2GrUjf" id="1FMyjUP8gKF" role="2Oq$k0">
-                                <ref role="2Gs0qQ" node="1FMyjUP8gn$" resolve="conn" />
-                              </node>
-                              <node concept="3TrEf2" id="1FMyjUP8hcv" role="2OqNvi">
-                                <ref role="3Tt5mk" to="bewr:3Cm$$O2us95" resolve="source" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3Tsc0h" id="1FMyjUP8i5N" role="2OqNvi">
-                            <ref role="3TtcxE" to="bewr:1FMyjUOZKzZ" resolve="startingConnections" />
-                          </node>
-                        </node>
-                        <node concept="TSZUe" id="1FMyjUP8mti" role="2OqNvi">
-                          <node concept="2GrUjf" id="1FMyjUP8mC2" role="25WWJ7">
-                            <ref role="2Gs0qQ" node="1FMyjUP8gn$" resolve="conn" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="2OqwBi" id="1FMyjUP86e_" role="2GsD0m">
-                <node concept="37vLTw" id="1FMyjUP8678" role="2Oq$k0">
-                  <ref role="3cqZAo" node="1FMyjUP85RU" resolve="crtModel" />
-                </node>
-                <node concept="2RRcyG" id="1FMyjUP8707" role="2OqNvi">
-                  <node concept="chp4Y" id="56SxUJ9miOg" role="3MHsoP">
-                    <ref role="cht4Q" to="bewr:3HVC1H6VUjH" resolve="FunctionalControlStructure" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2OqwBi" id="1FMyjUP84Jg" role="2GsD0m">
-            <node concept="37vLTw" id="1FMyjUP84DB" role="2Oq$k0">
-              <ref role="3cqZAo" node="1FMyjUP84sz" resolve="m" />
-            </node>
-            <node concept="liA8E" id="1FMyjUP85zj" role="2OqNvi">
-              <ref role="37wK5l" to="lui2:~SModule.getModels()" resolve="getModels" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="ffn8J" id="1FMyjUP84sz" role="3clF46">
-        <property role="TrG5h" value="m" />
-        <ref role="ffrpq" to="slm6:7fCCGqboj9J" resolve="m" />
-        <node concept="3uibUv" id="1FMyjUP84sy" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
-        </node>
-      </node>
-      <node concept="q3mfm" id="1FMyjUP84s$" role="3clF45">
-        <ref role="q3mfh" to="slm6:4F5w8gPXEEe" />
-        <ref role="1QQUv3" node="1FMyjUP84st" resolve="execute" />
-      </node>
-    </node>
-    <node concept="3tTeZs" id="1FMyjUP84s_" role="jymVt">
-      <property role="3tTeZt" value="&lt;no result checking&gt;" />
-      <ref role="3tTeZr" to="slm6:1JWcQ2VeXpD" resolve="check" />
-    </node>
-    <node concept="3uibUv" id="1FMyjUP84sA" role="1zkMxy">
-      <ref role="3uigEE" to="slm6:5TUCQr2ybBO" resolve="HasMigrationScriptReference" />
-    </node>
-  </node>
-  <node concept="3SyAh_" id="2ynKV3BFka_">
-    <property role="qMTe8" value="1" />
-    <property role="TrG5h" value="moveUnsafeControlActionsToCorrespondingKeyword" />
-    <node concept="3Tm1VV" id="2ynKV3BFkaA" role="1B3o_S" />
-    <node concept="3tTeZs" id="2ynKV3BFkaB" role="jymVt">
-      <property role="3tTeZt" value="&lt;no execute after&gt;" />
-      <ref role="3tTeZr" to="slm6:7ay_HjIMt1a" resolve="execute after" />
-    </node>
-    <node concept="3tTeZs" id="2ynKV3BFkaC" role="jymVt">
-      <property role="3tTeZt" value="&lt;no required data&gt;" />
-      <ref role="3tTeZr" to="slm6:5TUCQr2FPTh" resolve="requires annotation data" />
-    </node>
-    <node concept="3tTeZs" id="2ynKV3BFkaD" role="jymVt">
-      <property role="3tTeZt" value="&lt;no produced data&gt;" />
-      <ref role="3tTeZr" to="slm6:5TUCQr2C271" resolve="produces annotation data" />
-    </node>
-    <node concept="2tJIrI" id="2ynKV3BFkaE" role="jymVt" />
-    <node concept="3tYpMH" id="2ynKV3BFkaF" role="jymVt">
-      <property role="TrG5h" value="isRerunnable" />
-      <property role="3tYpME" value="true" />
-      <ref role="25KYV2" to="slm6:1JWcQ2VeWIs" resolve="isRerunnable" />
-      <node concept="3Tm1VV" id="2ynKV3BFkaG" role="1B3o_S" />
-      <node concept="10P_77" id="2ynKV3BFkaH" role="1tU5fm" />
-    </node>
-    <node concept="3tTeZs" id="2ynKV3BFkaI" role="jymVt">
-      <property role="3tTeZt" value="&lt;description&gt;" />
-      <ref role="3tTeZr" to="slm6:1_lSsE3RFpE" resolve="description" />
-    </node>
-    <node concept="q3mfD" id="2ynKV3BFkaJ" role="jymVt">
-      <property role="TrG5h" value="execute" />
-      <ref role="2VtyIY" to="slm6:4ubqdNOF9cA" resolve="execute" />
-      <node concept="3Tm1VV" id="2ynKV3BFkaL" role="1B3o_S" />
-      <node concept="3clFbS" id="2ynKV3BFkaN" role="3clF47">
-        <node concept="2Gpval" id="2ynKV3BFkCs" role="3cqZAp">
-          <node concept="2GrKxI" id="2ynKV3BFkCx" role="2Gsz3X">
-            <property role="TrG5h" value="_m" />
-          </node>
-          <node concept="3clFbS" id="2ynKV3BFkCF" role="2LFqv$">
-            <node concept="3cpWs8" id="2ynKV3BFkMF" role="3cqZAp">
-              <node concept="3cpWsn" id="2ynKV3BFkMI" role="3cpWs9">
-                <property role="TrG5h" value="mod" />
-                <node concept="H_c77" id="2ynKV3BFkME" role="1tU5fm" />
-                <node concept="2GrUjf" id="2ynKV3BFkO0" role="33vP2m">
-                  <ref role="2Gs0qQ" node="2ynKV3BFkCx" resolve="_m" />
-                </node>
-              </node>
-            </node>
-            <node concept="2Gpval" id="2ynKV3BFmei" role="3cqZAp">
-              <node concept="2GrKxI" id="2ynKV3BFmeo" role="2Gsz3X">
-                <property role="TrG5h" value="uca" />
-              </node>
-              <node concept="3clFbS" id="2ynKV3BFme$" role="2LFqv$">
-                <node concept="3cpWs8" id="2ynKV3BFmOj" role="3cqZAp">
-                  <node concept="3cpWsn" id="2ynKV3BFmOk" role="3cpWs9">
-                    <property role="TrG5h" value="analysis" />
-                    <node concept="3Tqbb2" id="2ynKV3BFmKc" role="1tU5fm">
-                      <ref role="ehGHo" to="bewr:1JhvKLLO08a" resolve="UnsafeControlAnalysis" />
-                    </node>
-                    <node concept="2OqwBi" id="2ynKV3BFmOl" role="33vP2m">
-                      <node concept="2GrUjf" id="2ynKV3BFmOm" role="2Oq$k0">
-                        <ref role="2Gs0qQ" node="2ynKV3BFmeo" resolve="uca" />
-                      </node>
-                      <node concept="2Xjw5R" id="2ynKV3BFmOn" role="2OqNvi">
-                        <node concept="1xMEDy" id="2ynKV3BFmOo" role="1xVPHs">
-                          <node concept="chp4Y" id="2ynKV3BFmOp" role="ri$Ld">
-                            <ref role="cht4Q" to="bewr:1JhvKLLO08a" resolve="UnsafeControlAnalysis" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="2ynKV3BFykJ" role="3cqZAp" />
-                <node concept="3cpWs8" id="6vZMoXu0MFP" role="3cqZAp">
-                  <node concept="3cpWsn" id="6vZMoXu0MFQ" role="3cpWs9">
-                    <property role="TrG5h" value="providingCausesHazardString" />
-                    <node concept="17QB3L" id="6vZMoXu0Meo" role="1tU5fm" />
-                    <node concept="Xl_RD" id="6vZMoXu0MUX" role="33vP2m">
-                      <property role="Xl_RC" value="Providing Causes Hazard" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3cpWs8" id="6vZMoXu1au$" role="3cqZAp">
-                  <node concept="3cpWsn" id="6vZMoXu1auB" role="3cpWs9">
-                    <property role="TrG5h" value="keywordsAlreadyDefined" />
-                    <node concept="10P_77" id="6vZMoXu1auy" role="1tU5fm" />
-                    <node concept="3clFbT" id="6vZMoXu1aFe" role="33vP2m" />
-                  </node>
-                </node>
-                <node concept="3clFbJ" id="6vZMoXu0NPW" role="3cqZAp">
-                  <node concept="3clFbS" id="6vZMoXu0NPY" role="3clFbx">
-                    <node concept="3clFbF" id="6vZMoXu1aNg" role="3cqZAp">
-                      <node concept="37vLTI" id="6vZMoXu1b6e" role="3clFbG">
-                        <node concept="3clFbT" id="6vZMoXu1b6G" role="37vLTx">
-                          <property role="3clFbU" value="true" />
-                        </node>
-                        <node concept="37vLTw" id="6vZMoXu1aNf" role="37vLTJ">
-                          <ref role="3cqZAo" node="6vZMoXu1auB" resolve="keywordsAlreadyDefined" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="6vZMoXu0T$7" role="3clFbw">
-                    <node concept="2OqwBi" id="6vZMoXu0Ro9" role="2Oq$k0">
-                      <node concept="37vLTw" id="6vZMoXu0RcB" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2ynKV3BFmOk" resolve="analysis" />
-                      </node>
-                      <node concept="3Tsc0h" id="6vZMoXu0RDc" role="2OqNvi">
-                        <ref role="3TtcxE" to="bewr:2ynKV3ByZHC" resolve="hazopKeywords" />
-                      </node>
-                    </node>
-                    <node concept="2HwmR7" id="6vZMoXu0VHT" role="2OqNvi">
-                      <node concept="1bVj0M" id="6vZMoXu0VHV" role="23t8la">
-                        <node concept="3clFbS" id="6vZMoXu0VHW" role="1bW5cS">
-                          <node concept="3clFbF" id="6vZMoXu0VPm" role="3cqZAp">
-                            <node concept="2OqwBi" id="6vZMoXu0WK2" role="3clFbG">
-                              <node concept="2OqwBi" id="6vZMoXu0W2N" role="2Oq$k0">
-                                <node concept="37vLTw" id="6vZMoXu0VPl" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6vZMoXu0VHX" resolve="it" />
-                                </node>
-                                <node concept="3TrcHB" id="6vZMoXu0Wnf" role="2OqNvi">
-                                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                </node>
-                              </node>
-                              <node concept="liA8E" id="6vZMoXu0XcG" role="2OqNvi">
-                                <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
-                                <node concept="37vLTw" id="6vZMoXu0X$Z" role="37wK5m">
-                                  <ref role="3cqZAo" node="6vZMoXu0MFQ" resolve="providingCausesHazardString" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="Rh6nW" id="6vZMoXu0VHX" role="1bW2Oz">
-                          <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6vZMoXu0VHY" role="1tU5fm" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="6vZMoXu0XIi" role="3cqZAp" />
-                <node concept="3clFbJ" id="6vZMoXu1bjg" role="3cqZAp">
-                  <node concept="3clFbS" id="6vZMoXu1bji" role="3clFbx">
-                    <node concept="3clFbF" id="2ynKV3BFmUd" role="3cqZAp">
-                      <node concept="2OqwBi" id="2ynKV3BFoUJ" role="3clFbG">
-                        <node concept="2OqwBi" id="2ynKV3BFn3c" role="2Oq$k0">
-                          <node concept="37vLTw" id="2ynKV3BFmUb" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2ynKV3BFmOk" resolve="analysis" />
-                          </node>
-                          <node concept="3Tsc0h" id="2ynKV3BFnjB" role="2OqNvi">
-                            <ref role="3TtcxE" to="bewr:2ynKV3ByZHC" resolve="hazopKeywords" />
-                          </node>
-                        </node>
-                        <node concept="TSZUe" id="2ynKV3BFru1" role="2OqNvi">
-                          <node concept="2pJPEk" id="2ynKV3BFrE5" role="25WWJ7">
-                            <node concept="2pJPED" id="2ynKV3BFrE7" role="2pJPEn">
-                              <ref role="2pJxaS" to="bewr:2ynKV3ByZHc" resolve="HazopKeywordDefinition" />
-                              <node concept="2pJxcG" id="2ynKV3BFs22" role="2pJxcM">
-                                <ref role="2pJxcJ" to="tpck:h0TrG11" resolve="name" />
-                                <node concept="37vLTw" id="6vZMoXu0MFT" role="28ntcv">
-                                  <ref role="3cqZAo" node="6vZMoXu0MFQ" resolve="providingCausesHazardString" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3fqX7Q" id="6vZMoXu1boB" role="3clFbw">
-                    <node concept="37vLTw" id="6vZMoXu1bpW" role="3fr31v">
-                      <ref role="3cqZAo" node="6vZMoXu1auB" resolve="keywordsAlreadyDefined" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3cpWs8" id="2ynKV3BIsRS" role="3cqZAp">
-                  <node concept="3cpWsn" id="2ynKV3BIsRT" role="3cpWs9">
-                    <property role="TrG5h" value="providing" />
-                    <node concept="3Tqbb2" id="2ynKV3BIsCo" role="1tU5fm">
-                      <ref role="ehGHo" to="bewr:2ynKV3BzAjr" resolve="ActionsForHazopKeyword" />
-                    </node>
-                    <node concept="2pJPEk" id="2ynKV3BIsRU" role="33vP2m">
-                      <node concept="2pJPED" id="2ynKV3BIsRV" role="2pJPEn">
-                        <ref role="2pJxaS" to="bewr:2ynKV3BzAjr" resolve="ActionsForHazopKeyword" />
-                        <node concept="2pIpSj" id="2ynKV3BIsRW" role="2pJxcM">
-                          <ref role="2pIpSl" to="bewr:2ynKV3BzAjs" resolve="actions" />
-                          <node concept="36be1Y" id="2ynKV3BIu7Z" role="28nt2d" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="2ynKV3BFslt" role="3cqZAp">
-                  <node concept="2OqwBi" id="2ynKV3BFuh9" role="3clFbG">
-                    <node concept="2OqwBi" id="2ynKV3BFstL" role="2Oq$k0">
-                      <node concept="2GrUjf" id="2ynKV3BFslr" role="2Oq$k0">
-                        <ref role="2Gs0qQ" node="2ynKV3BFmeo" resolve="uca" />
-                      </node>
-                      <node concept="3Tsc0h" id="2ynKV3BFsRU" role="2OqNvi">
-                        <ref role="3TtcxE" to="bewr:2ynKV3BzAk4" resolve="actionsForHazopKeyword" />
-                      </node>
-                    </node>
-                    <node concept="TSZUe" id="2ynKV3BFwBA" role="2OqNvi">
-                      <node concept="37vLTw" id="2ynKV3BIsRY" role="25WWJ7">
-                        <ref role="3cqZAo" node="2ynKV3BIsRT" resolve="providing" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="2ynKV3BIuv7" role="3cqZAp">
-                  <node concept="2OqwBi" id="2ynKV3BIxjg" role="3clFbG">
-                    <node concept="2OqwBi" id="2ynKV3BIuEy" role="2Oq$k0">
-                      <node concept="2GrUjf" id="2ynKV3BIuv5" role="2Oq$k0">
-                        <ref role="2Gs0qQ" node="2ynKV3BFmeo" resolve="uca" />
-                      </node>
-                      <node concept="3Tsc0h" id="2ynKV3BIvVK" role="2OqNvi">
-                        <ref role="3TtcxE" to="bewr:1JhvKLLOa0Y" resolve="providing" />
-                      </node>
-                    </node>
-                    <node concept="2es0OD" id="2ynKV3BI$yx" role="2OqNvi">
-                      <node concept="1bVj0M" id="2ynKV3BI$yz" role="23t8la">
-                        <node concept="3clFbS" id="2ynKV3BI$y$" role="1bW5cS">
-                          <node concept="3clFbF" id="2ynKV3BI$Fy" role="3cqZAp">
-                            <node concept="2OqwBi" id="2ynKV3BIEtV" role="3clFbG">
-                              <node concept="2OqwBi" id="2ynKV3BI$PT" role="2Oq$k0">
-                                <node concept="37vLTw" id="2ynKV3BI$Fx" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2ynKV3BIsRT" resolve="providing" />
-                                </node>
-                                <node concept="3Tsc0h" id="2ynKV3BID6s" role="2OqNvi">
-                                  <ref role="3TtcxE" to="bewr:2ynKV3BzAjs" resolve="actions" />
-                                </node>
-                              </node>
-                              <node concept="TSZUe" id="2ynKV3BIGJB" role="2OqNvi">
-                                <node concept="37vLTw" id="2ynKV3BIGUd" role="25WWJ7">
-                                  <ref role="3cqZAo" node="2ynKV3BI$y_" resolve="it" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="Rh6nW" id="2ynKV3BI$y_" role="1bW2Oz">
-                          <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2ynKV3BI$yA" role="1tU5fm" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="2ynKV3BI_nk" role="3cqZAp" />
-                <node concept="3cpWs8" id="6vZMoXu0N0n" role="3cqZAp">
-                  <node concept="3cpWsn" id="6vZMoXu0N0o" role="3cpWs9">
-                    <property role="TrG5h" value="notProvidingCausesHazardString" />
-                    <node concept="17QB3L" id="6vZMoXu0Meh" role="1tU5fm" />
-                    <node concept="Xl_RD" id="6vZMoXu0N9f" role="33vP2m">
-                      <property role="Xl_RC" value="Not Providing Causes Hazard" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbJ" id="6vZMoXu1bQm" role="3cqZAp">
-                  <node concept="3clFbS" id="6vZMoXu1bQn" role="3clFbx">
-                    <node concept="3clFbF" id="2ynKV3BFylI" role="3cqZAp">
-                      <node concept="2OqwBi" id="2ynKV3BFylJ" role="3clFbG">
-                        <node concept="2OqwBi" id="2ynKV3BFylK" role="2Oq$k0">
-                          <node concept="37vLTw" id="2ynKV3BFylL" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2ynKV3BFmOk" resolve="analysis" />
-                          </node>
-                          <node concept="3Tsc0h" id="2ynKV3BFylM" role="2OqNvi">
-                            <ref role="3TtcxE" to="bewr:2ynKV3ByZHC" resolve="hazopKeywords" />
-                          </node>
-                        </node>
-                        <node concept="TSZUe" id="2ynKV3BFylN" role="2OqNvi">
-                          <node concept="2pJPEk" id="2ynKV3BFylO" role="25WWJ7">
-                            <node concept="2pJPED" id="2ynKV3BFylP" role="2pJPEn">
-                              <ref role="2pJxaS" to="bewr:2ynKV3ByZHc" resolve="HazopKeywordDefinition" />
-                              <node concept="2pJxcG" id="2ynKV3BFylQ" role="2pJxcM">
-                                <ref role="2pJxcJ" to="tpck:h0TrG11" resolve="name" />
-                                <node concept="37vLTw" id="6vZMoXu0N0r" role="28ntcv">
-                                  <ref role="3cqZAo" node="6vZMoXu0N0o" resolve="notProvidingCausesHazardString" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3fqX7Q" id="6vZMoXu1bQy" role="3clFbw">
-                    <node concept="37vLTw" id="6vZMoXu1bQz" role="3fr31v">
-                      <ref role="3cqZAo" node="6vZMoXu1auB" resolve="keywordsAlreadyDefined" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3cpWs8" id="2ynKV3BI_vm" role="3cqZAp">
-                  <node concept="3cpWsn" id="2ynKV3BI_vn" role="3cpWs9">
-                    <property role="TrG5h" value="notProviding" />
-                    <node concept="3Tqbb2" id="2ynKV3BIyeC" role="1tU5fm">
-                      <ref role="ehGHo" to="bewr:2ynKV3BzAjr" resolve="ActionsForHazopKeyword" />
-                    </node>
-                    <node concept="2pJPEk" id="2ynKV3BI_vo" role="33vP2m">
-                      <node concept="2pJPED" id="2ynKV3BI_vp" role="2pJPEn">
-                        <ref role="2pJxaS" to="bewr:2ynKV3BzAjr" resolve="ActionsForHazopKeyword" />
-                        <node concept="2pIpSj" id="2ynKV3BI_vq" role="2pJxcM">
-                          <ref role="2pIpSl" to="bewr:2ynKV3BzAjs" resolve="actions" />
-                          <node concept="36be1Y" id="2ynKV3BIC8d" role="28nt2d" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="2ynKV3BFylx" role="3cqZAp">
-                  <node concept="2OqwBi" id="2ynKV3BFyly" role="3clFbG">
-                    <node concept="2OqwBi" id="2ynKV3BFylz" role="2Oq$k0">
-                      <node concept="2GrUjf" id="2ynKV3BFyl$" role="2Oq$k0">
-                        <ref role="2Gs0qQ" node="2ynKV3BFmeo" resolve="uca" />
-                      </node>
-                      <node concept="3Tsc0h" id="2ynKV3BFyl_" role="2OqNvi">
-                        <ref role="3TtcxE" to="bewr:2ynKV3BzAk4" resolve="actionsForHazopKeyword" />
-                      </node>
-                    </node>
-                    <node concept="TSZUe" id="2ynKV3BFylA" role="2OqNvi">
-                      <node concept="37vLTw" id="2ynKV3BI_vv" role="25WWJ7">
-                        <ref role="3cqZAo" node="2ynKV3BI_vn" resolve="notProviding" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="2ynKV3BICbH" role="3cqZAp">
-                  <node concept="2OqwBi" id="2ynKV3BICbI" role="3clFbG">
-                    <node concept="2OqwBi" id="2ynKV3BICbJ" role="2Oq$k0">
-                      <node concept="2GrUjf" id="2ynKV3BICbK" role="2Oq$k0">
-                        <ref role="2Gs0qQ" node="2ynKV3BFmeo" resolve="uca" />
-                      </node>
-                      <node concept="3Tsc0h" id="2ynKV3BICbL" role="2OqNvi">
-                        <ref role="3TtcxE" to="bewr:1JhvKLLO9K1" resolve="notProviding" />
-                      </node>
-                    </node>
-                    <node concept="2es0OD" id="2ynKV3BICbM" role="2OqNvi">
-                      <node concept="1bVj0M" id="2ynKV3BICbN" role="23t8la">
-                        <node concept="3clFbS" id="2ynKV3BICbO" role="1bW5cS">
-                          <node concept="3clFbF" id="2ynKV3BICbP" role="3cqZAp">
-                            <node concept="2OqwBi" id="2ynKV3BIIKm" role="3clFbG">
-                              <node concept="2OqwBi" id="2ynKV3BICbQ" role="2Oq$k0">
-                                <node concept="37vLTw" id="2ynKV3BICbR" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2ynKV3BI_vn" resolve="notProviding" />
-                                </node>
-                                <node concept="3Tsc0h" id="2ynKV3BIHm8" role="2OqNvi">
-                                  <ref role="3TtcxE" to="bewr:2ynKV3BzAjs" resolve="actions" />
-                                </node>
-                              </node>
-                              <node concept="TSZUe" id="2ynKV3BIKZW" role="2OqNvi">
-                                <node concept="37vLTw" id="2ynKV3BILa_" role="25WWJ7">
-                                  <ref role="3cqZAo" node="2ynKV3BICbU" resolve="it" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="Rh6nW" id="2ynKV3BICbU" role="1bW2Oz">
-                          <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2ynKV3BICbV" role="1tU5fm" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="2ynKV3BIsHi" role="3cqZAp" />
-                <node concept="3cpWs8" id="6vZMoXu0NeH" role="3cqZAp">
-                  <node concept="3cpWsn" id="6vZMoXu0NeI" role="3cpWs9">
-                    <property role="TrG5h" value="tooSoonOrLateString" />
-                    <node concept="17QB3L" id="6vZMoXu0Mcu" role="1tU5fm" />
-                    <node concept="Xl_RD" id="6vZMoXu0NoD" role="33vP2m">
-                      <property role="Xl_RC" value="Too Soon/Late, Out of Sequence" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbJ" id="6vZMoXu1cFM" role="3cqZAp">
-                  <node concept="3clFbS" id="6vZMoXu1cFN" role="3clFbx">
-                    <node concept="3clFbF" id="2ynKV3BFyYO" role="3cqZAp">
-                      <node concept="2OqwBi" id="2ynKV3BFyYP" role="3clFbG">
-                        <node concept="2OqwBi" id="2ynKV3BFyYQ" role="2Oq$k0">
-                          <node concept="37vLTw" id="2ynKV3BFyYR" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2ynKV3BFmOk" resolve="analysis" />
-                          </node>
-                          <node concept="3Tsc0h" id="2ynKV3BFyYS" role="2OqNvi">
-                            <ref role="3TtcxE" to="bewr:2ynKV3ByZHC" resolve="hazopKeywords" />
-                          </node>
-                        </node>
-                        <node concept="TSZUe" id="2ynKV3BFyYT" role="2OqNvi">
-                          <node concept="2pJPEk" id="2ynKV3BFyYU" role="25WWJ7">
-                            <node concept="2pJPED" id="2ynKV3BFyYV" role="2pJPEn">
-                              <ref role="2pJxaS" to="bewr:2ynKV3ByZHc" resolve="HazopKeywordDefinition" />
-                              <node concept="2pJxcG" id="2ynKV3BFyYW" role="2pJxcM">
-                                <ref role="2pJxcJ" to="tpck:h0TrG11" resolve="name" />
-                                <node concept="37vLTw" id="6vZMoXu0NeL" role="28ntcv">
-                                  <ref role="3cqZAo" node="6vZMoXu0NeI" resolve="tooSoonOrLateString" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3fqX7Q" id="6vZMoXu1cFY" role="3clFbw">
-                    <node concept="37vLTw" id="6vZMoXu1cFZ" role="3fr31v">
-                      <ref role="3cqZAo" node="6vZMoXu1auB" resolve="keywordsAlreadyDefined" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3cpWs8" id="2ynKV3BIMN5" role="3cqZAp">
-                  <node concept="3cpWsn" id="2ynKV3BIMN6" role="3cpWs9">
-                    <property role="TrG5h" value="tooSoonOrLate" />
-                    <node concept="3Tqbb2" id="2ynKV3BIMwy" role="1tU5fm">
-                      <ref role="ehGHo" to="bewr:2ynKV3BzAjr" resolve="ActionsForHazopKeyword" />
-                    </node>
-                    <node concept="2pJPEk" id="2ynKV3BIMN7" role="33vP2m">
-                      <node concept="2pJPED" id="2ynKV3BIMN8" role="2pJPEn">
-                        <ref role="2pJxaS" to="bewr:2ynKV3BzAjr" resolve="ActionsForHazopKeyword" />
-                        <node concept="2pIpSj" id="2ynKV3BIMN9" role="2pJxcM">
-                          <ref role="2pIpSl" to="bewr:2ynKV3BzAjs" resolve="actions" />
-                          <node concept="36be1Y" id="2ynKV3BIMNa" role="28nt2d" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="2ynKV3BFyYB" role="3cqZAp">
-                  <node concept="2OqwBi" id="2ynKV3BFyYC" role="3clFbG">
-                    <node concept="2OqwBi" id="2ynKV3BFyYD" role="2Oq$k0">
-                      <node concept="2GrUjf" id="2ynKV3BFyYE" role="2Oq$k0">
-                        <ref role="2Gs0qQ" node="2ynKV3BFmeo" resolve="uca" />
-                      </node>
-                      <node concept="3Tsc0h" id="2ynKV3BFyYF" role="2OqNvi">
-                        <ref role="3TtcxE" to="bewr:2ynKV3BzAk4" resolve="actionsForHazopKeyword" />
-                      </node>
-                    </node>
-                    <node concept="TSZUe" id="2ynKV3BFyYG" role="2OqNvi">
-                      <node concept="37vLTw" id="2ynKV3BIMNb" role="25WWJ7">
-                        <ref role="3cqZAo" node="2ynKV3BIMN6" resolve="tooSoonOrLate" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="2ynKV3BINuI" role="3cqZAp">
-                  <node concept="2OqwBi" id="2ynKV3BIQWe" role="3clFbG">
-                    <node concept="2OqwBi" id="2ynKV3BINFj" role="2Oq$k0">
-                      <node concept="2GrUjf" id="2ynKV3BINuG" role="2Oq$k0">
-                        <ref role="2Gs0qQ" node="2ynKV3BFmeo" resolve="uca" />
-                      </node>
-                      <node concept="3Tsc0h" id="2ynKV3BIPf8" role="2OqNvi">
-                        <ref role="3TtcxE" to="bewr:1JhvKLLOa12" resolve="soonLateOutOfSequence" />
-                      </node>
-                    </node>
-                    <node concept="2es0OD" id="2ynKV3BIUts" role="2OqNvi">
-                      <node concept="1bVj0M" id="2ynKV3BIUtu" role="23t8la">
-                        <node concept="3clFbS" id="2ynKV3BIUtv" role="1bW5cS">
-                          <node concept="3clFbF" id="2ynKV3BIUAv" role="3cqZAp">
-                            <node concept="2OqwBi" id="2ynKV3BIWCs" role="3clFbG">
-                              <node concept="2OqwBi" id="2ynKV3BIUKS" role="2Oq$k0">
-                                <node concept="37vLTw" id="2ynKV3BIUAu" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2ynKV3BIMN6" resolve="tooSoonOrLate" />
-                                </node>
-                                <node concept="3Tsc0h" id="2ynKV3BIVen" role="2OqNvi">
-                                  <ref role="3TtcxE" to="bewr:2ynKV3BzAjs" resolve="actions" />
-                                </node>
-                              </node>
-                              <node concept="TSZUe" id="2ynKV3BIYVV" role="2OqNvi">
-                                <node concept="37vLTw" id="2ynKV3BIZ6y" role="25WWJ7">
-                                  <ref role="3cqZAo" node="2ynKV3BIUtw" resolve="it" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="Rh6nW" id="2ynKV3BIUtw" role="1bW2Oz">
-                          <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2ynKV3BIUtx" role="1tU5fm" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="2ynKV3BINme" role="3cqZAp" />
-                <node concept="3cpWs8" id="6vZMoXu0Nw$" role="3cqZAp">
-                  <node concept="3cpWsn" id="6vZMoXu0Nw_" role="3cpWs9">
-                    <property role="TrG5h" value="stoppedTooSoonString" />
-                    <node concept="17QB3L" id="6vZMoXu0MdD" role="1tU5fm" />
-                    <node concept="Xl_RD" id="6vZMoXu0NDl" role="33vP2m">
-                      <property role="Xl_RC" value="Stopped too Soon, Applied too Long" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbJ" id="6vZMoXu1dxa" role="3cqZAp">
-                  <node concept="3clFbS" id="6vZMoXu1dxb" role="3clFbx">
-                    <node concept="3clFbF" id="2ynKV3BFzxy" role="3cqZAp">
-                      <node concept="2OqwBi" id="2ynKV3BFzxz" role="3clFbG">
-                        <node concept="2OqwBi" id="2ynKV3BFzx$" role="2Oq$k0">
-                          <node concept="37vLTw" id="2ynKV3BFzx_" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2ynKV3BFmOk" resolve="analysis" />
-                          </node>
-                          <node concept="3Tsc0h" id="2ynKV3BFzxA" role="2OqNvi">
-                            <ref role="3TtcxE" to="bewr:2ynKV3ByZHC" resolve="hazopKeywords" />
-                          </node>
-                        </node>
-                        <node concept="TSZUe" id="2ynKV3BFzxB" role="2OqNvi">
-                          <node concept="2pJPEk" id="2ynKV3BFzxC" role="25WWJ7">
-                            <node concept="2pJPED" id="2ynKV3BFzxD" role="2pJPEn">
-                              <ref role="2pJxaS" to="bewr:2ynKV3ByZHc" resolve="HazopKeywordDefinition" />
-                              <node concept="2pJxcG" id="2ynKV3BFzxE" role="2pJxcM">
-                                <ref role="2pJxcJ" to="tpck:h0TrG11" resolve="name" />
-                                <node concept="37vLTw" id="6vZMoXu0NwC" role="28ntcv">
-                                  <ref role="3cqZAo" node="6vZMoXu0Nw_" resolve="stoppedTooSoonString" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3fqX7Q" id="6vZMoXu1dxm" role="3clFbw">
-                    <node concept="37vLTw" id="6vZMoXu1dxn" role="3fr31v">
-                      <ref role="3cqZAo" node="6vZMoXu1auB" resolve="keywordsAlreadyDefined" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3cpWs8" id="2ynKV3BJ0Mq" role="3cqZAp">
-                  <node concept="3cpWsn" id="2ynKV3BJ0Mr" role="3cpWs9">
-                    <property role="TrG5h" value="stoppedTooSoon" />
-                    <node concept="3Tqbb2" id="2ynKV3BJ0zy" role="1tU5fm">
-                      <ref role="ehGHo" to="bewr:2ynKV3BzAjr" resolve="ActionsForHazopKeyword" />
-                    </node>
-                    <node concept="2pJPEk" id="2ynKV3BJ0Ms" role="33vP2m">
-                      <node concept="2pJPED" id="2ynKV3BJ0Mt" role="2pJPEn">
-                        <ref role="2pJxaS" to="bewr:2ynKV3BzAjr" resolve="ActionsForHazopKeyword" />
-                        <node concept="2pIpSj" id="2ynKV3BJ0Mu" role="2pJxcM">
-                          <ref role="2pIpSl" to="bewr:2ynKV3BzAjs" resolve="actions" />
-                          <node concept="36be1Y" id="2ynKV3BJ0Mv" role="28nt2d" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="2ynKV3BFzxl" role="3cqZAp">
-                  <node concept="2OqwBi" id="2ynKV3BFzxm" role="3clFbG">
-                    <node concept="2OqwBi" id="2ynKV3BFzxn" role="2Oq$k0">
-                      <node concept="2GrUjf" id="2ynKV3BFzxo" role="2Oq$k0">
-                        <ref role="2Gs0qQ" node="2ynKV3BFmeo" resolve="uca" />
-                      </node>
-                      <node concept="3Tsc0h" id="2ynKV3BFzxp" role="2OqNvi">
-                        <ref role="3TtcxE" to="bewr:2ynKV3BzAk4" resolve="actionsForHazopKeyword" />
-                      </node>
-                    </node>
-                    <node concept="TSZUe" id="2ynKV3BFzxq" role="2OqNvi">
-                      <node concept="37vLTw" id="2ynKV3BJ0Mw" role="25WWJ7">
-                        <ref role="3cqZAo" node="2ynKV3BJ0Mr" resolve="stoppedTooSoon" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="2ynKV3BJ1Y2" role="3cqZAp">
-                  <node concept="2OqwBi" id="2ynKV3BJ1Y3" role="3clFbG">
-                    <node concept="2OqwBi" id="2ynKV3BJ1Y4" role="2Oq$k0">
-                      <node concept="2GrUjf" id="2ynKV3BJ1Y5" role="2Oq$k0">
-                        <ref role="2Gs0qQ" node="2ynKV3BFmeo" resolve="uca" />
-                      </node>
-                      <node concept="3Tsc0h" id="2ynKV3BJ1Y6" role="2OqNvi">
-                        <ref role="3TtcxE" to="bewr:1JhvKLLOa17" resolve="stoppedTooSoonAppliedTooLong" />
-                      </node>
-                    </node>
-                    <node concept="2es0OD" id="2ynKV3BJ1Y7" role="2OqNvi">
-                      <node concept="1bVj0M" id="2ynKV3BJ1Y8" role="23t8la">
-                        <node concept="3clFbS" id="2ynKV3BJ1Y9" role="1bW5cS">
-                          <node concept="3clFbF" id="2ynKV3BJ1Ya" role="3cqZAp">
-                            <node concept="2OqwBi" id="2ynKV3BJ1Yb" role="3clFbG">
-                              <node concept="2OqwBi" id="2ynKV3BJ1Yc" role="2Oq$k0">
-                                <node concept="37vLTw" id="2ynKV3BJ1Yd" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2ynKV3BJ0Mr" resolve="stoppedTooSoon" />
-                                </node>
-                                <node concept="3Tsc0h" id="2ynKV3BJ1Ye" role="2OqNvi">
-                                  <ref role="3TtcxE" to="bewr:2ynKV3BzAjs" resolve="actions" />
-                                </node>
-                              </node>
-                              <node concept="TSZUe" id="2ynKV3BJ1Yf" role="2OqNvi">
-                                <node concept="37vLTw" id="2ynKV3BJ1Yg" role="25WWJ7">
-                                  <ref role="3cqZAo" node="2ynKV3BJ1Yh" resolve="it" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="Rh6nW" id="2ynKV3BJ1Yh" role="1bW2Oz">
-                          <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="2ynKV3BJ1Yi" role="1tU5fm" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="2OqwBi" id="2ynKV3BFl3x" role="2GsD0m">
-                <node concept="37vLTw" id="2ynKV3BFkWx" role="2Oq$k0">
-                  <ref role="3cqZAo" node="2ynKV3BFkMI" resolve="mod" />
-                </node>
-                <node concept="2SmgA7" id="2ynKV3BFlnK" role="2OqNvi">
-                  <node concept="chp4Y" id="2ynKV3BFlL1" role="1dBWTz">
-                    <ref role="cht4Q" to="bewr:1JhvKLLO08z" resolve="UnsafeControllerAction" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2OqwBi" id="2ynKV3BFkp1" role="2GsD0m">
-            <node concept="37vLTw" id="2ynKV3BFkjo" role="2Oq$k0">
-              <ref role="3cqZAo" node="2ynKV3BFkaP" resolve="m" />
-            </node>
-            <node concept="liA8E" id="2ynKV3BFkw_" role="2OqNvi">
-              <ref role="37wK5l" to="lui2:~SModule.getModels()" resolve="getModels" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="ffn8J" id="2ynKV3BFkaP" role="3clF46">
-        <property role="TrG5h" value="m" />
-        <ref role="ffrpq" to="slm6:7fCCGqboj9J" resolve="m" />
-        <node concept="3uibUv" id="2ynKV3BFkaO" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
-        </node>
-      </node>
-      <node concept="q3mfm" id="2ynKV3BFkaQ" role="3clF45">
-        <ref role="q3mfh" to="slm6:4F5w8gPXEEe" />
-        <ref role="1QQUv3" node="2ynKV3BFkaJ" resolve="execute" />
-      </node>
-    </node>
-    <node concept="3tTeZs" id="2ynKV3BFkaR" role="jymVt">
-      <property role="3tTeZt" value="&lt;no result checking&gt;" />
-      <ref role="3tTeZr" to="slm6:1JWcQ2VeXpD" resolve="check" />
-    </node>
-    <node concept="3uibUv" id="2ynKV3BFkaS" role="1zkMxy">
-      <ref role="3uigEE" to="slm6:5TUCQr2ybBO" resolve="HasMigrationScriptReference" />
-    </node>
-  </node>
+  <registry />
 </model>
 
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.plugin.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.plugin.mps
index 8027f3747..a8397ce4c 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.plugin.mps
@@ -9,6 +9,7 @@
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
     <use id="8ca79d43-eb45-4791-bdd4-0d6130ff895b" name="de.itemis.mps.editor.diagram.layout" version="0" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
+    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.structure.mps
index f8a85e9b5..de1ca730f 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.structure.mps
@@ -30,7 +30,6 @@
       </concept>
     </language>
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
-      <concept id="1224240836180" name="jetbrains.mps.lang.structure.structure.DeprecatedNodeAnnotation" flags="ig" index="asaX9" />
       <concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
         <property id="6714410169261853888" name="conceptId" index="EcuMT" />
         <property id="4628067390765907488" name="conceptShortDescription" index="R4oN_" />
@@ -61,7 +60,6 @@
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
@@ -81,14 +79,6 @@
       <property role="20lbJX" value="fLJekj5/_0__n" />
       <ref role="20lvS9" node="3HVC1H6VUjI" resolve="SafetyControlStructureElementBase" />
     </node>
-    <node concept="1TJgyj" id="3HVC1H6VUGY" role="1TKVEi">
-      <property role="IQ2ns" value="4286195509387832126" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="connections" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
-      <ref role="20lvS9" node="3HVC1H6VUjJ" resolve="SafetyControlStructureConnectionBase" />
-      <node concept="asaX9" id="1FMyjUP84sa" role="lGtFl" />
-    </node>
     <node concept="PrWs8" id="3Cm$$O2ux$k" role="PzmwI">
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
     </node>
@@ -270,38 +260,6 @@
     <property role="34LRSv" value="unsafe control action" />
     <property role="3GE5qa" value="baseLanguage.analysis" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyj" id="1JhvKLLO9K1" role="1TKVEi">
-      <property role="IQ2ns" value="2004523000582413313" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="notProviding" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
-      <ref role="20lvS9" node="1JhvKLLO9K9" resolve="ActionDescriptionBase" />
-      <node concept="asaX9" id="2ynKV3BzAlo" role="lGtFl" />
-    </node>
-    <node concept="1TJgyj" id="1JhvKLLOa0Y" role="1TKVEi">
-      <property role="IQ2ns" value="2004523000582414398" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="providing" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
-      <ref role="20lvS9" node="1JhvKLLO9K9" resolve="ActionDescriptionBase" />
-      <node concept="asaX9" id="2ynKV3BzAlq" role="lGtFl" />
-    </node>
-    <node concept="1TJgyj" id="1JhvKLLOa12" role="1TKVEi">
-      <property role="IQ2ns" value="2004523000582414402" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="soonLateOutOfSequence" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
-      <ref role="20lvS9" node="1JhvKLLO9K9" resolve="ActionDescriptionBase" />
-      <node concept="asaX9" id="2ynKV3BzAls" role="lGtFl" />
-    </node>
-    <node concept="1TJgyj" id="1JhvKLLOa17" role="1TKVEi">
-      <property role="IQ2ns" value="2004523000582414407" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="stoppedTooSoonAppliedTooLong" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
-      <ref role="20lvS9" node="1JhvKLLO9K9" resolve="ActionDescriptionBase" />
-      <node concept="asaX9" id="2ynKV3BzAlu" role="lGtFl" />
-    </node>
     <node concept="1TJgyj" id="2ynKV3BzAk4" role="1TKVEi">
       <property role="IQ2ns" value="2925021647566955780" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
@@ -321,12 +279,6 @@
     <property role="R5$K7" value="true" />
     <property role="3GE5qa" value="baseLanguage.analysis.action" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyj" id="6RZi9ii$cW_" role="1TKVEi">
-      <property role="IQ2ns" value="7926133672146685733" />
-      <property role="20kJfa" value="hazard" />
-      <ref role="20lvS9" to="cjwq:7TjUbLQ451K" resolve="Hazard" />
-      <node concept="asaX9" id="1TjUjQRQU06" role="lGtFl" />
-    </node>
     <node concept="1TJgyj" id="1TjUjQRQU01" role="1TKVEi">
       <property role="IQ2ns" value="2185346695491723265" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/models/test.com.fasten.safety.ft._020_cutset_propagation@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/models/test.com.fasten.safety.ft._020_cutset_propagation@tests.mps
index 4aa3cfd7b..8621634b0 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/models/test.com.fasten.safety.ft._020_cutset_propagation@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/models/test.com.fasten.safety.ft._020_cutset_propagation@tests.mps
@@ -9,6 +9,7 @@
     <use id="8ca79d43-eb45-4791-bdd4-0d6130ff895b" name="de.itemis.mps.editor.diagram.layout" version="0" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
+    <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
   </languages>
   <imports>
     <import index="n7z1" ref="r:d9248eb8-cb38-4cb3-8454-cc903ebf6c86(com.fasten.safety.ft.typesystem)" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/test.com.fasten.safety.ft.msd b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/test.com.fasten.safety.ft.msd
index 3884ed204..e4cd2e2e6 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/test.com.fasten.safety.ft.msd
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/test.com.fasten.safety.ft.msd
@@ -53,6 +53,7 @@
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="6" />
+    <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
@@ -67,6 +68,7 @@
     <module reference="4dc47fba-0f4f-4162-820b-d2e1e306482d(com.fasten.safety.ft.pluginSolution)" version="0" />
     <module reference="54912f5b-43b5-48a6-b710-8bbe3bcf9649(com.fasten.safety.ft.xfta.pluginSolution)" version="0" />
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
+    <module reference="8ca79d43-eb45-4791-bdd4-0d6130ff895b(de.itemis.mps.editor.diagram.layout)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="6e248481-1e6c-406d-9f02-c27ea5429a61(test.com.fasten.safety.ft)" version="0" />
   </dependencyVersions>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_022_charging_cable_hazards_list.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_022_charging_cable_hazards_list.mpsr
index da0f4b602..b975da766 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_022_charging_cable_hazards_list.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_022_charging_cable_hazards_list.mpsr
@@ -11,9 +11,12 @@
         <child id="9102875167978228305" name="hazards" index="8gIbH" />
       </concept>
       <concept id="9102875167978180720" name="com.mbeddr.formal.safety.hara.structure.Hazard" flags="ng" index="8gVzc">
-        <reference id="2626862697025873504" name="loss" index="2HxXJk" />
+        <child id="7926133672145657778" name="losses" index="3Zv_sA" />
       </concept>
       <concept id="9102875167978180681" name="com.mbeddr.formal.safety.hara.structure.HazardsList" flags="ng" index="8gVzP" />
+      <concept id="7926133672145657758" name="com.mbeddr.formal.safety.hara.structure.LossRef" flags="ng" index="3Zv_sa">
+        <reference id="7926133672145657759" name="loss" index="3Zv_sb" />
+      </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
@@ -37,65 +40,77 @@
     <node concept="1a6Z8w" id="3TSGpjyEYYX" role="8gIbH">
       <property role="TrG5h" value="Electrical hazard" />
       <property role="0lsPA" value="H01" />
-      <ref role="2HxXJk" node="2hOvri9WU6G" resolve="Loss of life or serious injury to people" />
       <node concept="3h3uym" id="5ehf6dVA6bI" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNLe/E4" />
         <property role="3h3uzD" value="24PsEXFbNKN/S1" />
         <property role="3h3uzF" value="24PsEXFbNLp/C2" />
         <ref role="3h3iM1" node="55oVyA0mSMy" resolve="OS1" />
       </node>
+      <node concept="3Zv_sa" id="31dqLs$$zGt" role="3Zv_sA">
+        <ref role="3Zv_sb" node="2hOvri9WU6G" resolve="Loss of life or serious injury to people" />
+      </node>
     </node>
     <node concept="1a6Z8w" id="3TSGpjyFlEA" role="8gIbH">
       <property role="0lsPA" value="H02" />
       <property role="TrG5h" value="Explosion of the car" />
-      <ref role="2HxXJk" node="2hOvri9WU6G" resolve="Loss of life or serious injury to people" />
       <node concept="3h3uym" id="5ehf6dVA6bL" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNLe/E4" />
         <property role="3h3uzD" value="24PsEXFbNKU/S3" />
         <property role="3h3uzF" value="24PsEXFbNLt/C3" />
         <ref role="3h3iM1" node="55oVyA0mSMy" resolve="OS1" />
       </node>
+      <node concept="3Zv_sa" id="31dqLs$$zGj" role="3Zv_sA">
+        <ref role="3Zv_sb" node="2hOvri9WU6G" resolve="Loss of life or serious injury to people" />
+      </node>
     </node>
     <node concept="1a6Z8w" id="3TSGpjyFlES" role="8gIbH">
       <property role="0lsPA" value="H03" />
       <property role="TrG5h" value="Cable temperature too high" />
-      <ref role="2HxXJk" node="2hOvri9WU6H" resolve="Electrical damage (economic loss)" />
       <node concept="3h3uym" id="5ehf6dVA6bS" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNLe/E4" />
         <property role="3h3uzF" value="24PsEXFbNLp/C2" />
         <ref role="3h3iM1" node="55oVyA0mSMy" resolve="OS1" />
       </node>
+      <node concept="3Zv_sa" id="31dqLs$$zGl" role="3Zv_sA">
+        <ref role="3Zv_sb" node="2hOvri9WU6H" resolve="Electrical damage (economic loss)" />
+      </node>
     </node>
     <node concept="1a6Z8w" id="3TSGpjyFlFc" role="8gIbH">
       <property role="0lsPA" value="H04" />
       <property role="TrG5h" value="The cable catches fire" />
-      <ref role="2HxXJk" node="2hOvri9WU6H" resolve="Electrical damage (economic loss)" />
       <node concept="3h3uym" id="5ehf6dVA6bV" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNLe/E4" />
         <property role="3h3uzD" value="24PsEXFbNKU/S3" />
         <property role="3h3uzF" value="24PsEXFbNLp/C2" />
         <ref role="3h3iM1" node="55oVyA0mSMy" resolve="OS1" />
       </node>
+      <node concept="3Zv_sa" id="31dqLs$$zGn" role="3Zv_sA">
+        <ref role="3Zv_sb" node="2hOvri9WU6H" resolve="Electrical damage (economic loss)" />
+      </node>
     </node>
     <node concept="1a6Z8w" id="3TSGpjyFlFy" role="8gIbH">
       <property role="0lsPA" value="H05" />
       <property role="TrG5h" value="Smoke comes out of the cable" />
-      <ref role="2HxXJk" node="2hOvri9WU6H" resolve="Electrical damage (economic loss)" />
       <node concept="3h3uym" id="5ehf6dVA6bY" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNLe/E4" />
         <property role="3h3uzD" value="24PsEXFbNKQ/S2" />
         <property role="3h3uzF" value="24PsEXFbNLp/C2" />
         <ref role="3h3iM1" node="55oVyA0mSMy" resolve="OS1" />
       </node>
+      <node concept="3Zv_sa" id="31dqLs$$zGp" role="3Zv_sA">
+        <ref role="3Zv_sb" node="2hOvri9WU6H" resolve="Electrical damage (economic loss)" />
+      </node>
     </node>
     <node concept="1a6Z8w" id="3TSGpjyFlFU" role="8gIbH">
       <property role="0lsPA" value="H06" />
       <property role="TrG5h" value="Tripping" />
-      <ref role="2HxXJk" node="2hOvri9WU6G" resolve="Loss of life or serious injury to people" />
       <node concept="3h3uym" id="5ehf6dVA8Ox" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNLe/E4" />
         <ref role="3h3iM1" node="55oVyA0mSMy" resolve="OS1" />
       </node>
+      <node concept="3Zv_sa" id="31dqLs$$zGr" role="3Zv_sA">
+        <ref role="3Zv_sb" node="2hOvri9WU6G" resolve="Loss of life or serious injury to people" />
+      </node>
     </node>
   </node>
 </model>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_101_lane_keeping_hazard_list_ASIL_A_H04.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_101_lane_keeping_hazard_list_ASIL_A_H04.mpsr
index 849eb152a..a5a9dbd89 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_101_lane_keeping_hazard_list_ASIL_A_H04.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_101_lane_keeping_hazard_list_ASIL_A_H04.mpsr
@@ -11,9 +11,12 @@
         <child id="9102875167978228305" name="hazards" index="8gIbH" />
       </concept>
       <concept id="9102875167978180720" name="com.mbeddr.formal.safety.hara.structure.Hazard" flags="ng" index="8gVzc">
-        <reference id="2626862697025873504" name="loss" index="2HxXJk" />
+        <child id="7926133672145657778" name="losses" index="3Zv_sA" />
       </concept>
       <concept id="9102875167978180681" name="com.mbeddr.formal.safety.hara.structure.HazardsList" flags="ng" index="8gVzP" />
+      <concept id="7926133672145657758" name="com.mbeddr.formal.safety.hara.structure.LossRef" flags="ng" index="3Zv_sa">
+        <reference id="7926133672145657759" name="loss" index="3Zv_sb" />
+      </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
@@ -35,169 +38,204 @@
     <node concept="1a6Z8w" id="G$XGFsgYdV" role="8gIbH">
       <property role="0lsPA" value="H01" />
       <property role="TrG5h" value="Missing of lane markers - ASIL QM " />
-      <ref role="2HxXJk" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
       <node concept="3h3uym" id="75La0fJyPjx" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNL9/E3" />
         <ref role="3h3iM1" node="55oVyA0mUqx" resolve="OS1_LK" />
       </node>
+      <node concept="3Zv_sa" id="31dqLs$$zGv" role="3Zv_sA">
+        <ref role="3Zv_sb" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
+      </node>
     </node>
     <node concept="1a6Z8w" id="G$XGFsgYeb" role="8gIbH">
       <property role="TrG5h" value="System does not recognize lane - ASIL QM" />
       <property role="0lsPA" value="H03" />
-      <ref role="2HxXJk" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
       <node concept="3h3uym" id="75La0fJyPj$" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNL9/E3" />
         <ref role="3h3iM1" node="55oVyA0mUqx" resolve="OS1_LK" />
       </node>
+      <node concept="3Zv_sa" id="31dqLs$$zGx" role="3Zv_sA">
+        <ref role="3Zv_sb" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
+      </node>
     </node>
     <node concept="1a6Z8w" id="G$XGFsgYel" role="8gIbH">
       <property role="TrG5h" value="System recognizes wrong lane -  ASIL B" />
       <property role="0lsPA" value="H04" />
-      <ref role="2HxXJk" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
       <node concept="3h3uym" id="75La0fJyPjO" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNL5/E2" />
         <ref role="3h3iM1" node="75La0fJyPjB" resolve="OS2_LK" />
       </node>
+      <node concept="3Zv_sa" id="31dqLs$$zGz" role="3Zv_sA">
+        <ref role="3Zv_sb" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
+      </node>
     </node>
     <node concept="1a6Z8w" id="G$XGFsgYex" role="8gIbH">
       <property role="TrG5h" value="Delayed steering - ASIL QM" />
       <property role="0lsPA" value="H05" />
-      <ref role="2HxXJk" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
       <node concept="3h3uym" id="75La0fJyPk3" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNL2/E1" />
         <ref role="3h3iM1" node="75La0fJyPjR" resolve="OS3_LK" />
       </node>
+      <node concept="3Zv_sa" id="31dqLs$$zG_" role="3Zv_sA">
+        <ref role="3Zv_sb" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
+      </node>
     </node>
     <node concept="1a6Z8w" id="G$XGFsgYeJ" role="8gIbH">
       <property role="TrG5h" value="Overshooting/oszillation of system - ASIL QM" />
       <property role="0lsPA" value="H06" />
-      <ref role="2HxXJk" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
       <node concept="3h3uym" id="75La0fJyPk6" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNL2/E1" />
         <ref role="3h3iM1" node="75La0fJyPjR" resolve="OS3_LK" />
       </node>
+      <node concept="3Zv_sa" id="31dqLs$$zGB" role="3Zv_sA">
+        <ref role="3Zv_sb" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
+      </node>
     </node>
     <node concept="1a6Z8w" id="G$XGFsgYeZ" role="8gIbH">
       <property role="TrG5h" value="Uncomfortable steering - ASIL QM" />
       <property role="0lsPA" value="H07" />
-      <ref role="2HxXJk" node="G$XGFsgYcm" resolve="Loss of customer satisfaction" />
       <node concept="3h3uym" id="75La0fJyPk9" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNL2/E1" />
         <ref role="3h3iM1" node="75La0fJyPjR" resolve="OS3_LK" />
       </node>
+      <node concept="3Zv_sa" id="31dqLs$$zGD" role="3Zv_sA">
+        <ref role="3Zv_sb" node="G$XGFsgYcm" resolve="Loss of customer satisfaction" />
+      </node>
     </node>
     <node concept="1a6Z8w" id="G$XGFsgYfh" role="8gIbH">
       <property role="TrG5h" value="Delayed overtaking of driver - ASIL QM" />
       <property role="0lsPA" value="H08" />
-      <ref role="2HxXJk" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
       <node concept="3h3uym" id="75La0fJyPkc" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNL5/E2" />
         <ref role="3h3iM1" node="75La0fJyPjB" resolve="OS2_LK" />
       </node>
+      <node concept="3Zv_sa" id="31dqLs$$zGF" role="3Zv_sA">
+        <ref role="3Zv_sb" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
+      </node>
     </node>
     <node concept="1a6Z8w" id="G$XGFsgYfV" role="8gIbH">
       <property role="TrG5h" value="Overwrite/prevent driver input - ASIL QM" />
       <property role="0lsPA" value="H10" />
-      <ref role="2HxXJk" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
       <node concept="3h3uym" id="75La0fJyPkf" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNL2/E1" />
         <ref role="3h3iM1" node="75La0fJyPjR" resolve="OS3_LK" />
       </node>
+      <node concept="3Zv_sa" id="31dqLs$$zGH" role="3Zv_sA">
+        <ref role="3Zv_sb" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
+      </node>
     </node>
     <node concept="1a6Z8w" id="G$XGFsgYgj" role="8gIbH">
       <property role="TrG5h" value="Compensation of hardware faults - ASIL QM" />
       <property role="0lsPA" value="H11" />
-      <ref role="2HxXJk" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
       <node concept="3h3uym" id="75La0fJyPki" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNL2/E1" />
         <ref role="3h3iM1" node="75La0fJyPjR" resolve="OS3_LK" />
       </node>
+      <node concept="3Zv_sa" id="31dqLs$$zGJ" role="3Zv_sA">
+        <ref role="3Zv_sb" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
+      </node>
     </node>
     <node concept="1a6Z8w" id="G$XGFsgYgH" role="8gIbH">
       <property role="TrG5h" value="Unnecessary warnings - ASIL QM" />
       <property role="0lsPA" value="H12" />
-      <ref role="2HxXJk" node="G$XGFsgYcm" resolve="Loss of customer satisfaction" />
       <node concept="3h3uym" id="75La0fJyPkl" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNL5/E2" />
         <ref role="3h3iM1" node="75La0fJyPjB" resolve="OS2_LK" />
       </node>
+      <node concept="3Zv_sa" id="31dqLs$$zGL" role="3Zv_sA">
+        <ref role="3Zv_sb" node="G$XGFsgYcm" resolve="Loss of customer satisfaction" />
+      </node>
     </node>
     <node concept="1a6Z8w" id="G$XGFsgYh9" role="8gIbH">
       <property role="TrG5h" value="Complicated interface - ASIL QM" />
       <property role="0lsPA" value="H13" />
-      <ref role="2HxXJk" node="G$XGFsgYcm" resolve="Loss of customer satisfaction" />
       <node concept="3h3uym" id="75La0fJyPko" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNL2/E1" />
         <ref role="3h3iM1" node="75La0fJyPjR" resolve="OS3_LK" />
       </node>
+      <node concept="3Zv_sa" id="31dqLs$$zGN" role="3Zv_sA">
+        <ref role="3Zv_sb" node="G$XGFsgYcm" resolve="Loss of customer satisfaction" />
+      </node>
     </node>
     <node concept="1a6Z8w" id="G$XGFsgYhB" role="8gIbH">
       <property role="TrG5h" value="Driver not informed about takeover - ASIL QM" />
       <property role="0lsPA" value="H14" />
-      <ref role="2HxXJk" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
       <node concept="3h3uym" id="75La0fJyPkr" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNL2/E1" />
         <ref role="3h3iM1" node="75La0fJyPjR" resolve="OS3_LK" />
       </node>
+      <node concept="3Zv_sa" id="31dqLs$$zGP" role="3Zv_sA">
+        <ref role="3Zv_sb" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
+      </node>
     </node>
     <node concept="1a6Z8w" id="G$XGFsgYi7" role="8gIbH">
       <property role="TrG5h" value="Unwanted deactivation - ASIL QM" />
       <property role="0lsPA" value="H15" />
-      <ref role="2HxXJk" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
       <node concept="3h3uym" id="75La0fJyPku" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNL2/E1" />
         <ref role="3h3iM1" node="75La0fJyPjR" resolve="OS3_LK" />
       </node>
+      <node concept="3Zv_sa" id="31dqLs$$zGR" role="3Zv_sA">
+        <ref role="3Zv_sb" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
+      </node>
     </node>
     <node concept="1a6Z8w" id="G$XGFsgYiD" role="8gIbH">
       <property role="TrG5h" value="No correction of unintended user input - ASIL QM" />
       <property role="0lsPA" value="H16" />
-      <ref role="2HxXJk" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
       <node concept="3h3uym" id="75La0fJyPkx" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNL2/E1" />
         <ref role="3h3iM1" node="75La0fJyPjR" resolve="OS3_LK" />
       </node>
+      <node concept="3Zv_sa" id="31dqLs$$zGT" role="3Zv_sA">
+        <ref role="3Zv_sb" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
+      </node>
     </node>
     <node concept="1a6Z8w" id="G$XGFsgYjd" role="8gIbH">
       <property role="TrG5h" value="Wrong data processing (bug) - ASIL QM" />
       <property role="0lsPA" value="H17" />
-      <ref role="2HxXJk" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
       <node concept="3h3uym" id="75La0fJyPk$" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNL2/E1" />
         <ref role="3h3iM1" node="75La0fJyPjR" resolve="OS3_LK" />
       </node>
+      <node concept="3Zv_sa" id="31dqLs$$zGV" role="3Zv_sA">
+        <ref role="3Zv_sb" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
+      </node>
     </node>
     <node concept="1a6Z8w" id="G$XGFsgYkr" role="8gIbH">
       <property role="TrG5h" value="Failure of hardware - ASIL A" />
       <property role="0lsPA" value="H19" />
-      <ref role="2HxXJk" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
       <node concept="3h3uym" id="75La0fJyPkB" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNL5/E2" />
         <ref role="3h3iM1" node="75La0fJyPjB" resolve="OS2_LK" />
       </node>
+      <node concept="3Zv_sa" id="31dqLs$$zGX" role="3Zv_sA">
+        <ref role="3Zv_sb" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
+      </node>
     </node>
     <node concept="1a6Z8w" id="G$XGFsgYl5" role="8gIbH">
       <property role="TrG5h" value="Camera is dirty - ASIL QM" />
       <property role="0lsPA" value="H20" />
-      <ref role="2HxXJk" node="G$XGFsgYch" resolve="Loss of mission" />
       <node concept="3h3uym" id="75La0fJyPkE" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNL5/E2" />
         <ref role="3h3iM1" node="75La0fJyPjB" resolve="OS2_LK" />
       </node>
+      <node concept="3Zv_sa" id="31dqLs$$zGZ" role="3Zv_sA">
+        <ref role="3Zv_sb" node="G$XGFsgYch" resolve="Loss of mission" />
+      </node>
     </node>
     <node concept="1a6Z8w" id="G$XGFsgYmv" role="8gIbH">
       <property role="TrG5h" value="Overexposed camera - ASIL QM" />
       <property role="0lsPA" value="H21" />
-      <ref role="2HxXJk" node="G$XGFsgYch" resolve="Loss of mission" />
       <node concept="3h3uym" id="75La0fJyPkL" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNL5/E2" />
         <ref role="3h3iM1" node="75La0fJyPjB" resolve="OS2_LK" />
       </node>
+      <node concept="3Zv_sa" id="31dqLs$$zH1" role="3Zv_sA">
+        <ref role="3Zv_sb" node="G$XGFsgYch" resolve="Loss of mission" />
+      </node>
     </node>
     <node concept="1a6Z8w" id="4GKPLBASxXu" role="8gIbH">
       <property role="0lsPA" value="H22" />
       <property role="TrG5h" value="Leaving of lane - ASIL B" />
-      <ref role="2HxXJk" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
       <node concept="3h3uym" id="75La0fJyPkO" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNL9/E3" />
         <ref role="3h3iM1" node="55oVyA0mUqx" resolve="OS1_LK" />
@@ -206,29 +244,35 @@
     <node concept="1a6Z8w" id="lV44fsLWj5" role="8gIbH">
       <property role="0lsPA" value="H23" />
       <property role="TrG5h" value="Bad system feedback to driver (e.g. error reporting) - ASIL QM" />
-      <ref role="2HxXJk" node="G$XGFsgYcm" resolve="Loss of customer satisfaction" />
       <node concept="3h3uym" id="75La0fJyPkR" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNL2/E1" />
         <ref role="3h3iM1" node="75La0fJyPjR" resolve="OS3_LK" />
       </node>
+      <node concept="3Zv_sa" id="31dqLs$$zH3" role="3Zv_sA">
+        <ref role="3Zv_sb" node="G$XGFsgYcm" resolve="Loss of customer satisfaction" />
+      </node>
     </node>
     <node concept="1a6Z8w" id="lV44fsLWjR" role="8gIbH">
       <property role="0lsPA" value="H24" />
       <property role="TrG5h" value="User interface devices not working properly - ASIL QM" />
-      <ref role="2HxXJk" node="G$XGFsgYcm" resolve="Loss of customer satisfaction" />
       <node concept="3h3uym" id="75La0fJyPkU" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNL2/E1" />
         <ref role="3h3iM1" node="75La0fJyPjR" resolve="OS3_LK" />
       </node>
+      <node concept="3Zv_sa" id="31dqLs$$zH5" role="3Zv_sA">
+        <ref role="3Zv_sb" node="G$XGFsgYcm" resolve="Loss of customer satisfaction" />
+      </node>
     </node>
     <node concept="1a6Z8w" id="lV44fsLWkF" role="8gIbH">
       <property role="TrG5h" value="Lane keeping system cannot be activated - ASIL QM" />
       <property role="0lsPA" value="H25" />
-      <ref role="2HxXJk" node="G$XGFsgYcm" resolve="Loss of customer satisfaction" />
       <node concept="3h3uym" id="75La0fJyPkX" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNL2/E1" />
         <ref role="3h3iM1" node="75La0fJyPjR" resolve="OS3_LK" />
       </node>
+      <node concept="3Zv_sa" id="31dqLs$$zH7" role="3Zv_sA">
+        <ref role="3Zv_sb" node="G$XGFsgYcm" resolve="Loss of customer satisfaction" />
+      </node>
     </node>
   </node>
 </model>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_101_eb_hazard_list_ASIL_B_H03.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_101_eb_hazard_list_ASIL_B_H03.mpsr
index 5aa800383..b79d2423f 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_101_eb_hazard_list_ASIL_B_H03.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_101_eb_hazard_list_ASIL_B_H03.mpsr
@@ -11,9 +11,12 @@
         <child id="9102875167978228305" name="hazards" index="8gIbH" />
       </concept>
       <concept id="9102875167978180720" name="com.mbeddr.formal.safety.hara.structure.Hazard" flags="ng" index="8gVzc">
-        <reference id="2626862697025873504" name="loss" index="2HxXJk" />
+        <child id="7926133672145657778" name="losses" index="3Zv_sA" />
       </concept>
       <concept id="9102875167978180681" name="com.mbeddr.formal.safety.hara.structure.HazardsList" flags="ng" index="8gVzP" />
+      <concept id="7926133672145657758" name="com.mbeddr.formal.safety.hara.structure.LossRef" flags="ng" index="3Zv_sa">
+        <reference id="7926133672145657759" name="loss" index="3Zv_sb" />
+      </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
@@ -41,16 +44,20 @@
     <node concept="1a6Z8w" id="G$XGFsgYdV" role="8gIbH">
       <property role="0lsPA" value="H01" />
       <property role="TrG5h" value="Warning issued too late - ASIL QM" />
-      <ref role="2HxXJk" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
       <node concept="3h3uym" id="75La0fJz0jj" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNL5/E2" />
         <ref role="3h3iM1" node="75La0fJyZ19" resolve="EB_OS_001" />
       </node>
+      <node concept="3Zv_sa" id="31dqLs$$zH9" role="3Zv_sA">
+        <ref role="3Zv_sb" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
+      </node>
     </node>
     <node concept="1a6Z8w" id="3XLpsf2__9h" role="8gIbH">
       <property role="0lsPA" value="H02" />
       <property role="TrG5h" value="Braking initiated too late - ASIL A" />
-      <ref role="2HxXJk" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
+      <node concept="3Zv_sa" id="31dqLs$$zHb" role="3Zv_sA">
+        <ref role="3Zv_sb" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
+      </node>
       <node concept="3h3uym" id="75La0fJz0jm" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNL5/E2" />
         <property role="3h3uzD" value="24PsEXFbNKQ/S2" />
@@ -61,7 +68,9 @@
     <node concept="1a6Z8w" id="3XLpsf2__9p" role="8gIbH">
       <property role="0lsPA" value="H03" />
       <property role="TrG5h" value="Car crashes into obstacle - ASIL B" />
-      <ref role="2HxXJk" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
+      <node concept="3Zv_sa" id="31dqLs$$zHd" role="3Zv_sA">
+        <ref role="3Zv_sb" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
+      </node>
       <node concept="3h3uym" id="75La0fJz0jp" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNL5/E2" />
         <property role="3h3uzD" value="24PsEXFbNKU/S3" />
@@ -72,31 +81,37 @@
     <node concept="1a6Z8w" id="3XLpsf2__9z" role="8gIbH">
       <property role="0lsPA" value="H04" />
       <property role="TrG5h" value="Unnecessary warning - ASIL QM" />
-      <ref role="2HxXJk" node="G$XGFsgYcm" resolve="Loss of customer satisfaction" />
       <node concept="3h3uym" id="75La0fJz0jJ" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNL9/E3" />
         <ref role="3h3iM1" node="75La0fJz0jA" resolve="EB_OS_002" />
       </node>
+      <node concept="3Zv_sa" id="31dqLs$$zHf" role="3Zv_sA">
+        <ref role="3Zv_sb" node="G$XGFsgYcm" resolve="Loss of customer satisfaction" />
+      </node>
     </node>
     <node concept="1a6Z8w" id="3XLpsf2__9J" role="8gIbH">
       <property role="0lsPA" value="H05" />
       <property role="TrG5h" value="Unnecessary braking - ASIL QM" />
-      <ref role="2HxXJk" node="G$XGFsgYcm" resolve="Loss of customer satisfaction" />
       <node concept="3h3uym" id="75La0fJz0jM" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNL9/E3" />
         <ref role="3h3iM1" node="75La0fJz0jA" resolve="EB_OS_002" />
       </node>
+      <node concept="3Zv_sa" id="31dqLs$$zHh" role="3Zv_sA">
+        <ref role="3Zv_sb" node="G$XGFsgYcm" resolve="Loss of customer satisfaction" />
+      </node>
     </node>
     <node concept="1a6Z8w" id="3XLpsf2__9X" role="8gIbH">
       <property role="0lsPA" value="H06" />
       <property role="TrG5h" value="Strong breaking leads to rear end collision - ASIL A" />
-      <ref role="2HxXJk" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
       <node concept="3h3uym" id="75La0fJz0js" role="3h3uzw">
         <property role="3h3uzC" value="24PsEXFbNL5/E2" />
         <property role="3h3uzD" value="24PsEXFbNKQ/S2" />
         <property role="3h3uzF" value="24PsEXFbNLt/C3" />
         <ref role="3h3iM1" node="75La0fJyZ19" resolve="EB_OS_001" />
       </node>
+      <node concept="3Zv_sa" id="31dqLs$$zHj" role="3Zv_sA">
+        <ref role="3Zv_sb" node="G$XGFsgYc9" resolve="Loss of life or injury to people" />
+      </node>
     </node>
   </node>
 </model>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._000_hara/_110_unsafe_control_actions.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._000_hara/_110_unsafe_control_actions.mpsr
index abc61a5aa..08fe392e7 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._000_hara/_110_unsafe_control_actions.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._000_hara/_110_unsafe_control_actions.mpsr
@@ -22,7 +22,7 @@
         <child id="2925021647566955780" name="actionsForHazopKeyword" index="3f6qqO" />
       </concept>
       <concept id="2004523000582413321" name="com.mbeddr.formal.safety.stamp.structure.ActionDescriptionBase" flags="ng" index="1E0uc5">
-        <reference id="7926133672146685733" name="hazard" index="3ZrSuL" />
+        <child id="2185346695491723265" name="hazards" index="2Dy4$W" />
       </concept>
       <concept id="2004523000582413322" name="com.mbeddr.formal.safety.stamp.structure.TextualActionDescription" flags="ng" index="1E0uc6">
         <child id="2004523000582413323" name="text" index="1E0uc7" />
@@ -37,6 +37,11 @@
         <property id="2557074442922438158" name="escapedValue" index="19SUeA" />
       </concept>
     </language>
+    <language id="17da266c-02d9-4bbd-b69b-8a656b49f45c" name="com.mbeddr.formal.safety.hara">
+      <concept id="7998766141987827621" name="com.mbeddr.formal.safety.hara.structure.HazardRef" flags="ng" index="DABN8">
+        <reference id="7998766141987827622" name="hazard" index="DABNb" />
+      </concept>
+    </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
@@ -53,43 +58,51 @@
         <node concept="3f6qtF" id="6vZMoXu3Mk9" role="3f6qqO">
           <node concept="1E0uc6" id="_wUu$U7zXT" role="3f6qtG">
             <property role="TrG5h" value="UCA_PLAN_CEM_TRAJ_02" />
-            <ref role="3ZrSuL" node="_wUu$U7zXF" resolve="Collision with another vehicle" />
             <node concept="19SGf9" id="_wUu$U7zXU" role="1E0uc7">
               <node concept="19SUe$" id="_wUu$U7zXV" role="19SJt6">
                 <property role="19SUeA" value="when another vehicle drives parallel to the object and ego enters the other lane =&gt; collision" />
               </node>
             </node>
+            <node concept="DABN8" id="31dqLs$$zHl" role="2Dy4$W">
+              <ref role="DABNb" node="_wUu$U7zXF" resolve="Collision with another vehicle" />
+            </node>
           </node>
           <node concept="1E0uc6" id="_wUu$U7zXM" role="3f6qtG">
             <property role="TrG5h" value="UCA_PLAN_CEM_TRAJ_03" />
-            <ref role="3ZrSuL" node="_wUu$U7zXF" resolve="Collision with another vehicle" />
             <node concept="19SGf9" id="_wUu$U7zXQ" role="1E0uc7">
               <node concept="19SUe$" id="_wUu$U7zXR" role="19SJt6">
                 <property role="19SUeA" value="when another vehicle drives parallel to the object and the other vehicle enters (comes too close to) ego lane =&gt; potential collision" />
               </node>
             </node>
+            <node concept="DABN8" id="31dqLs$$zHn" role="2Dy4$W">
+              <ref role="DABNb" node="_wUu$U7zXF" resolve="Collision with another vehicle" />
+            </node>
           </node>
         </node>
         <node concept="3f6qtF" id="6vZMoXu3Mkb" role="3f6qqO">
           <node concept="1E0uc6" id="_wUu$TYGPy" role="3f6qtG">
             <property role="TrG5h" value="UCA_PLAN_CEM_TRAJ_01" />
-            <ref role="3ZrSuL" node="_wUu$U7zXF" resolve="Collision with another vehicle" />
             <node concept="19SGf9" id="_wUu$TYGP$" role="1E0uc7">
               <node concept="19SUe$" id="_wUu$TYGP_" role="19SJt6">
                 <property role="19SUeA" value="during L3 driving and in presence of an object in ego lane =&gt; potential collision / activation of emergency braking" />
               </node>
             </node>
+            <node concept="DABN8" id="31dqLs$$zHp" role="2Dy4$W">
+              <ref role="DABNb" node="_wUu$U7zXF" resolve="Collision with another vehicle" />
+            </node>
           </node>
         </node>
         <node concept="3f6qtF" id="6vZMoXu3Mkd" role="3f6qqO">
           <node concept="1E0uc6" id="_wUu$TYGP1" role="3f6qtG">
             <property role="TrG5h" value="UCA_PLAN_CEM_TRAJ_04" />
-            <ref role="3ZrSuL" node="_wUu$U7zXF" resolve="Collision with another vehicle" />
             <node concept="19SGf9" id="_wUu$TYGP2" role="1E0uc7">
               <node concept="19SUe$" id="_wUu$TYGP3" role="19SJt6">
                 <property role="19SUeA" value="when computed too late can lead to the necessity of an emergency maneuver =&gt; potential collision" />
               </node>
             </node>
+            <node concept="DABN8" id="31dqLs$$zHr" role="2Dy4$W">
+              <ref role="DABNb" node="_wUu$U7zXF" resolve="Collision with another vehicle" />
+            </node>
           </node>
         </node>
         <node concept="3f6qtF" id="6vZMoXu3Mkf" role="3f6qqO">
@@ -101,12 +114,14 @@
         <node concept="3f6qtF" id="6vZMoXu3Mkg" role="3f6qqO">
           <node concept="1E0uc6" id="_wUu$U7zY1" role="3f6qtG">
             <property role="TrG5h" value="UCA_PLAN_CEM_FUN_ACT_01" />
-            <ref role="3ZrSuL" node="_wUu$U7zXF" resolve="Collision with another vehicle" />
             <node concept="19SGf9" id="_wUu$U7zY2" role="1E0uc7">
               <node concept="19SUe$" id="_wUu$U7zY3" role="19SJt6">
                 <property role="19SUeA" value="during highway L3 mode, false provision leads to driver thinking CEM is executed, if obstacle =&gt; collision" />
               </node>
             </node>
+            <node concept="DABN8" id="31dqLs$$zHt" role="2Dy4$W">
+              <ref role="DABNb" node="_wUu$U7zXF" resolve="Collision with another vehicle" />
+            </node>
           </node>
         </node>
         <node concept="3f6qtF" id="6vZMoXu3Mkh" role="3f6qqO">
@@ -123,12 +138,14 @@
         <node concept="3f6qtF" id="6vZMoXu3Mkk" role="3f6qqO">
           <node concept="1E0uc6" id="41_NtXJu_8_" role="3f6qtG">
             <property role="TrG5h" value="UCA_DRIVER_DEACTIVATE_01" />
-            <ref role="3ZrSuL" node="_wUu$U7zXF" resolve="Collision with another vehicle" />
             <node concept="19SGf9" id="41_NtXJu_8E" role="1E0uc7">
               <node concept="19SUe$" id="41_NtXJu_8F" role="19SJt6">
                 <property role="19SUeA" value="when driving on highway, if driver is not aware that L3 mode is abandoned =&gt; collision" />
               </node>
             </node>
+            <node concept="DABN8" id="31dqLs$$zHv" role="2Dy4$W">
+              <ref role="DABNb" node="_wUu$U7zXF" resolve="Collision with another vehicle" />
+            </node>
           </node>
         </node>
         <node concept="3f6qtF" id="6vZMoXu3Mkl" role="3f6qqO">
@@ -142,12 +159,14 @@
         <node concept="3f6qtF" id="6vZMoXu3Mko" role="3f6qqO">
           <node concept="1E0uc6" id="41_NtXJu_8P" role="3f6qtG">
             <property role="TrG5h" value="UCA_DRIVER_ACTIVATE_01" />
-            <ref role="3ZrSuL" node="_wUu$U7zXF" resolve="Collision with another vehicle" />
             <node concept="19SGf9" id="41_NtXJu_8Q" role="1E0uc7">
               <node concept="19SUe$" id="41_NtXJu_8R" role="19SJt6">
                 <property role="19SUeA" value="when driving on highway, if driver is not aware but CEM is active =&gt; confusion of the driver possible leading to collision" />
               </node>
             </node>
+            <node concept="DABN8" id="31dqLs$$zHx" role="2Dy4$W">
+              <ref role="DABNb" node="_wUu$U7zXF" resolve="Collision with another vehicle" />
+            </node>
           </node>
         </node>
         <node concept="3f6qtF" id="6vZMoXu3Mkp" role="3f6qqO">
@@ -167,12 +186,14 @@
         <node concept="3f6qtF" id="6vZMoXu3Mkt" role="3f6qqO">
           <node concept="1E0uc6" id="_wUu$TYGP4" role="3f6qtG">
             <property role="TrG5h" value="UCA_PER_TRACKING_01" />
-            <ref role="3ZrSuL" node="_wUu$U7zXF" resolve="Collision with another vehicle" />
             <node concept="19SGf9" id="_wUu$TYGP5" role="1E0uc7">
               <node concept="19SUe$" id="_wUu$TYGP6" role="19SJt6">
                 <property role="19SUeA" value="when driving =&gt; collision" />
               </node>
             </node>
+            <node concept="DABN8" id="31dqLs$$zHz" role="2Dy4$W">
+              <ref role="DABNb" node="_wUu$U7zXF" resolve="Collision with another vehicle" />
+            </node>
           </node>
         </node>
         <node concept="3f6qtF" id="6vZMoXu3Mku" role="3f6qqO" />
@@ -183,23 +204,27 @@
         <node concept="3f6qtF" id="6vZMoXu3Mkw" role="3f6qqO">
           <node concept="1E0uc6" id="_wUu$TYGPg" role="3f6qtG">
             <property role="TrG5h" value="UCA_PER_OBST_DET_02" />
-            <ref role="3ZrSuL" node="_wUu$U7zXF" resolve="Collision with another vehicle" />
             <node concept="19SGf9" id="_wUu$TYGPh" role="1E0uc7">
               <node concept="19SUe$" id="_wUu$TYGPi" role="19SJt6">
                 <property role="19SUeA" value="- false positive / imprecise detection during driving =&gt; unnecessary evasion maneuver / &quot;chaotic&quot; behavior of EGO =&gt; potential collision with other participants" />
               </node>
             </node>
+            <node concept="DABN8" id="31dqLs$$zH_" role="2Dy4$W">
+              <ref role="DABNb" node="_wUu$U7zXF" resolve="Collision with another vehicle" />
+            </node>
           </node>
         </node>
         <node concept="3f6qtF" id="6vZMoXu3Mkx" role="3f6qqO">
           <node concept="1E0uc6" id="_wUu$TYGP9" role="3f6qtG">
             <property role="TrG5h" value="UCA_PER_OBST_DET_01" />
-            <ref role="3ZrSuL" node="_wUu$TYbEK" resolve="Collision with another vehicle" />
             <node concept="19SGf9" id="_wUu$TYGPa" role="1E0uc7">
               <node concept="19SUe$" id="_wUu$TYGPb" role="19SJt6">
                 <property role="19SUeA" value="- during L3 driving =&gt; later activation of emergency braking / potential collision" />
               </node>
             </node>
+            <node concept="DABN8" id="31dqLs$$zHB" role="2Dy4$W">
+              <ref role="DABNb" node="_wUu$TYbEK" resolve="Collision with another vehicle" />
+            </node>
           </node>
         </node>
         <node concept="3f6qtF" id="6vZMoXu3Mky" role="3f6qqO" />