diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/editor.mps
index 329e78486..305e50af8 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/editor.mps
@@ -4029,7 +4029,7 @@
           <node concept="3clFbS" id="2o_v82yBrAa" role="2VODD2">
             <node concept="3clFbF" id="2o_v82yBzjs" role="3cqZAp">
               <node concept="Xl_RD" id="2o_v82yBzjr" role="3clFbG">
-                <property role="Xl_RC" value="Reset Counter" />
+                <property role="Xl_RC" value="Propagate Prefix" />
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/typesystem.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/typesystem.mps
index d43f95c73..01f365a54 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/typesystem.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/typesystem.mps
@@ -152,6 +152,7 @@
       <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">
@@ -160,6 +161,7 @@
       <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>
@@ -449,6 +451,15 @@
         </node>
       </node>
     </node>
+    <node concept="QznSV" id="2bKcjDgHJjL" role="QzAvj">
+      <node concept="3clFbS" id="2bKcjDgHJjM" role="2VODD2">
+        <node concept="3clFbF" id="2bKcjDgHJoy" role="3cqZAp">
+          <node concept="Xl_RD" id="2bKcjDgHJox" role="3clFbG">
+            <property role="Xl_RC" value="Propagate Prefix Changes" />
+          </node>
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="18kY7G" id="3f8ZVRYdzmR">
     <property role="TrG5h" value="check_IndexPrefix" />
@@ -605,7 +616,6 @@
                     <ref role="3cqZAo" node="84ljAGCXdv" resolve="nodeUsingPrefix" />
                   </node>
                   <node concept="3Cnw8n" id="3f8ZVRYf_jS" role="1urrFz">
-                    <property role="ARO6o" value="true" />
                     <ref role="QpYPw" node="3f8ZVRYftjp" resolve="fix_GoalStructureElementsNames_basedOnPrefix" />
                     <node concept="3CnSsL" id="3f8ZVRYf_oM" role="3Coj4f">
                       <ref role="QkamJ" node="3f8ZVRYftxu" resolve="nodeWithPrefixedName" />
@@ -808,7 +818,6 @@
                   </node>
                   <node concept="2Mj0R9" id="3f8ZVRYe7X$" role="3cqZAp">
                     <node concept="3Cnw8n" id="3f8ZVRYfD01" role="1urrFz">
-                      <property role="ARO6o" value="true" />
                       <ref role="QpYPw" node="3f8ZVRYftjp" resolve="fix_GoalStructureElementsNames_basedOnPrefix" />
                       <node concept="3CnSsL" id="3f8ZVRYfD02" role="3Coj4f">
                         <ref role="QkamJ" node="3f8ZVRYftxu" resolve="nodeWithPrefixedName" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/com.fasten.safety.ft.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/com.fasten.safety.ft.mpl
index f50276f75..14a4a372c 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/com.fasten.safety.ft.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/com.fasten.safety.ft.mpl
@@ -15,7 +15,6 @@
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
-    <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">56c81845-acaf-48a7-bcd8-e29b36c98dd7(de.itemis.mps.editor.diagram.styles)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">bda054c4-5d71-46ca-aba0-7104e3070b5a(com.mbeddr.mpsutil.treenotation.styles)</dependency>
@@ -26,10 +25,10 @@
     <dependency reexport="false">20c6e580-bdc5-4067-8049-d7e3265a86de(jetbrains.mps.typesystemEngine)</dependency>
     <dependency reexport="false">c0080a47-7e37-4558-bee9-9ae18e690549(jetbrains.mps.lang.extension)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
+    <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:120e1c9d-4e27-4478-b2af-b2c3bd3850b0:com.mbeddr.mpsutil.editor.querylist" version="0" />
-    <language slang="l:309e0004-4976-4416-b947-ec02ae4ecef2:com.mbeddr.mpsutil.modellisteners" version="0" />
     <language slang="l:c73b17af-16a1-4490-8072-8a84937c5206:com.mbeddr.mpsutil.treenotation" version="0" />
     <language slang="l:bda054c4-5d71-46ca-aba0-7104e3070b5a:com.mbeddr.mpsutil.treenotation.styles" version="0" />
     <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="0" />
@@ -107,6 +106,8 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="20c6e580-bdc5-4067-8049-d7e3265a86de(jetbrains.mps.typesystemEngine)" version="0" />
   </dependencyVersions>
-  <extendedLanguages />
+  <extendedLanguages>
+    <extendedLanguage>83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</extendedLanguage>
+  </extendedLanguages>
 </language>
 
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.listeners.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.listeners.mps
deleted file mode 100644
index ecacf8255..000000000
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.listeners.mps
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:116a88ab-4190-4d88-9674-83f968e77b41(com.fasten.safety.ft.listeners)">
-  <persistence version="9" />
-  <languages>
-    <use id="309e0004-4976-4416-b947-ec02ae4ecef2" name="com.mbeddr.mpsutil.modellisteners" version="0" />
-    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
-  </languages>
-  <imports>
-    <import index="iihn" ref="r:1ca0ad9f-f283-47a0-9785-0fcac08d0fee(com.mbeddr.formal.base.prefixed_names_utils)" />
-    <import index="spwl" ref="r:ea5ecccc-669e-41c1-a43d-021bc4263d33(com.fasten.safety.ft.structure)" implicit="true" />
-    <import index="b19z" ref="r:11a68676-9d63-4e1c-b920-59aefe77def3(com.mbeddr.formal.base.structure)" implicit="true" />
-  </imports>
-  <registry>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
-        <child id="1137022507850" name="body" index="2VODD2" />
-      </concept>
-      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
-        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
-      </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="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>
-    </language>
-    <language id="309e0004-4976-4416-b947-ec02ae4ecef2" name="com.mbeddr.mpsutil.modellisteners">
-      <concept id="5818559022137760597" name="com.mbeddr.mpsutil.modellisteners.structure.Parameter_instance" flags="ng" index="j_vvf" />
-      <concept id="5818559022137597839" name="com.mbeddr.mpsutil.modellisteners.structure.ConceptModelListeners" flags="ng" index="jA7cl">
-        <reference id="1213093996982" name="concept" index="1M2myG" />
-        <child id="5818559022137986141" name="listeners" index="j$A37" />
-      </concept>
-      <concept id="6105788070833315443" name="com.mbeddr.mpsutil.modellisteners.structure.PropertyListener" flags="ig" index="3vq$el">
-        <reference id="6105788070833315720" name="property" index="3vq$9I" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="jA7cl" id="3SCsB3Dohhg">
-    <ref role="1M2myG" to="spwl:5rwT_JnuQVv" resolve="FaultTree" />
-    <node concept="3vq$el" id="3SCsB3Dohhh" role="j$A37">
-      <ref role="3vq$9I" to="b19z:3f8ZVRYdw4Q" resolve="idPrefix" />
-      <node concept="3clFbS" id="3SCsB3Dohhi" role="2VODD2">
-        <node concept="3clFbF" id="33rrvp3CTtj" role="3cqZAp">
-          <node concept="2YIFZM" id="3QMOguhhmPL" role="3clFbG">
-            <ref role="1Pybhc" to="iihn:33rrvp3Cvkb" resolve="PrefixFixingUtils" />
-            <ref role="37wK5l" to="iihn:33rrvp3CyGy" resolve="fixPrefix" />
-            <node concept="j_vvf" id="33rrvp3CTuu" role="37wK5m" />
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-</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 74cf7358f..45b0c4a60 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
@@ -7,8 +7,8 @@
   </languages>
   <imports>
     <import index="87nw" ref="r:ca2ab6bb-f6e7-4c0f-a88c-b78b9b31fff3(de.slisson.mps.richtext.structure)" />
+    <import index="b19z" ref="r:11a68676-9d63-4e1c-b920-59aefe77def3(com.mbeddr.formal.base.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
-    <import index="b19z" ref="r:11a68676-9d63-4e1c-b920-59aefe77def3(com.mbeddr.formal.base.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources">
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/com.mbeddr.formal.safety.argument.runtime.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/com.mbeddr.formal.safety.argument.runtime.mpl
index f66c19df1..5fa73114b 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/com.mbeddr.formal.safety.argument.runtime.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/com.mbeddr.formal.safety.argument.runtime.mpl
@@ -11,53 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="com.mbeddr.formal.safety.argument.runtime.generator" uuid="710773f6-0978-4f74-b363-1651e13ea041">
-      <models>
-        <modelRoot contentPath="${module}/generator" type="default">
-          <sourceRoot location="templates" />
-        </modelRoot>
-      </models>
-      <facets>
-        <facet type="java">
-          <classes generated="true" path="${module}/generator/classes_gen" />
-        </facet>
-      </facets>
-      <external-templates />
-      <languageVersions>
-        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-        <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
-        <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
-        <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
-        <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
-        <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <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>
-        <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
-        <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-        <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
-        <module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
-        <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
-        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-        <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
-        <module reference="e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)" version="0" />
-        <module reference="546ac349-3106-438d-b92b-7d2ebfa2ade8(com.mbeddr.formal.safety.argument.runtime)" version="0" />
-        <module reference="710773f6-0978-4f74-b363-1651e13ea041(com.mbeddr.formal.safety.argument.runtime.generator)" version="0" />
-        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-      </dependencyVersions>
-      <mapping-priorities />
-    </generator>
-  </generators>
   <sourcePath />
   <dependencies>
     <dependency reexport="false">d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)</dependency>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/generator/templates/com.mbeddr.formal.safety.argument.runtime.generator.templates@generator.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/generator/templates/com.mbeddr.formal.safety.argument.runtime.generator.templates@generator.mps
deleted file mode 100644
index b4be7c862..000000000
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/generator/templates/com.mbeddr.formal.safety.argument.runtime.generator.templates@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:ea13ceb0-4807-4871-ac6a-51ebf9962f91(com.mbeddr.formal.safety.argument.runtime.generator.templates@generator)">
-  <persistence version="9" />
-  <languages>
-    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
-  </languages>
-  <imports>
-    <import index="vdvw" ref="r:0dab1cea-0da9-4395-bdbd-beac207923df(com.mbeddr.formal.safety.argument.runtime.structure)" />
-  </imports>
-  <registry>
-    <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
-      <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
-    </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>
-  </registry>
-  <node concept="bUwia" id="56pBK14yqjb">
-    <property role="TrG5h" value="main" />
-  </node>
-</model>
-
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/com.mbeddr.formal.safety.cae.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/com.mbeddr.formal.safety.cae.mpl
index cddc566e7..2163310f3 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/com.mbeddr.formal.safety.cae.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/com.mbeddr.formal.safety.cae.mpl
@@ -11,63 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="com.mbeddr.formal.safety.cae.generator" uuid="832c49e4-a4ce-4d15-b597-aeac59d83aff">
-      <models>
-        <modelRoot contentPath="${module}/generator" type="default">
-          <sourceRoot location="templates" />
-        </modelRoot>
-      </models>
-      <facets>
-        <facet type="java">
-          <classes generated="true" path="${module}/generator/classes_gen" />
-        </facet>
-      </facets>
-      <external-templates />
-      <languageVersions>
-        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-        <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
-        <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
-        <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
-        <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
-        <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <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>
-        <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
-        <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-        <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
-        <module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
-        <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
-        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-        <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
-        <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
-        <module reference="eb32334c-372a-488f-ba9b-e549a59115e9(com.mbeddr.formal.safety.cae)" version="0" />
-        <module reference="832c49e4-a4ce-4d15-b597-aeac59d83aff(com.mbeddr.formal.safety.cae.generator)" version="0" />
-        <module reference="e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)" 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" />
-        <module reference="8ca79d43-eb45-4791-bdd4-0d6130ff895b(de.itemis.mps.editor.diagram.layout)" version="0" />
-        <module reference="1144260c-e9a5-49a2-9add-39a1a1a7077e(de.itemis.mps.editor.diagram.runtime)" version="0" />
-        <module reference="56c81845-acaf-48a7-bcd8-e29b36c98dd7(de.itemis.mps.editor.diagram.styles)" version="0" />
-        <module reference="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
-        <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
-        <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
-        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-      </dependencyVersions>
-      <mapping-priorities />
-    </generator>
-  </generators>
   <sourcePath />
   <dependencies>
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/generator/templates/com.mbeddr.formal.safety.cae.generator.templates@generator.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/generator/templates/com.mbeddr.formal.safety.cae.generator.templates@generator.mps
deleted file mode 100644
index ddd4ce036..000000000
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/generator/templates/com.mbeddr.formal.safety.cae.generator.templates@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:3bde3d14-39da-4053-860f-0ad0cdd10100(com.mbeddr.formal.safety.cae.generator.templates@generator)">
-  <persistence version="9" />
-  <languages>
-    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
-  </languages>
-  <imports>
-    <import index="cdmc" ref="r:d4129e7d-34b5-4657-8b81-f5b9fbe93567(com.mbeddr.formal.safety.cae.structure)" />
-  </imports>
-  <registry>
-    <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
-      <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
-    </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>
-  </registry>
-  <node concept="bUwia" id="2ojFC2JaQmv">
-    <property role="TrG5h" value="main" />
-  </node>
-</model>
-
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/models/com.mbeddr.formal.safety.cae.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/models/com.mbeddr.formal.safety.cae.editor.mps
index 9cb5eabdc..6001b5f1d 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/models/com.mbeddr.formal.safety.cae.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/models/com.mbeddr.formal.safety.cae.editor.mps
@@ -348,6 +348,7 @@
         </node>
         <node concept="3F0ifn" id="6xcemMvtSWJ" role="3EZMnx">
           <property role="3F0ifm" value=":" />
+          <ref role="1k5W1q" to="g35p:4HjFLZ$nN39" resolve="GSNBaseLanguageKeyword" />
           <node concept="11L4FC" id="6xcemMvuhWL" role="3F10Kt">
             <property role="VOm3f" value="true" />
           </node>
@@ -418,6 +419,7 @@
           </node>
           <node concept="3F0ifn" id="1zMKqRpqUpe" role="3EZMnx">
             <property role="3F0ifm" value=":" />
+            <ref role="1k5W1q" to="g35p:4HjFLZ$nN39" resolve="GSNBaseLanguageKeyword" />
             <node concept="11L4FC" id="1zMKqRpqUpf" role="3F10Kt">
               <property role="VOm3f" value="true" />
             </node>
@@ -753,6 +755,7 @@
         </node>
         <node concept="3F0ifn" id="3VR5nzkXXnr" role="3EZMnx">
           <property role="3F0ifm" value=":" />
+          <ref role="1k5W1q" to="g35p:4HjFLZ$nN39" resolve="GSNBaseLanguageKeyword" />
           <node concept="11L4FC" id="3VR5nzkXXns" role="3F10Kt">
             <property role="VOm3f" value="true" />
           </node>
@@ -850,6 +853,7 @@
         </node>
         <node concept="3F0ifn" id="4doguZRxAN" role="3EZMnx">
           <property role="3F0ifm" value=":" />
+          <ref role="1k5W1q" to="g35p:4HjFLZ$nN39" resolve="GSNBaseLanguageKeyword" />
           <node concept="11L4FC" id="4doguZRxAO" role="3F10Kt">
             <property role="VOm3f" value="true" />
           </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.editor.mps
index 0fa6eb2b5..c1b22c33b 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.editor.mps
@@ -190,6 +190,9 @@
       <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
         <child id="1137022507850" name="body" index="2VODD2" />
       </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="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
@@ -1345,6 +1348,12 @@
       </node>
       <node concept="3F0ifn" id="56pBK14vZdq" role="3EZMnx">
         <property role="3F0ifm" value="::" />
+        <node concept="11L4FC" id="5l6J5csSGKa" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="11LMrY" id="5l6J5csSGKf" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
       </node>
       <node concept="1iCGBv" id="56pBK14tHC8" role="3EZMnx">
         <ref role="1NtTu8" to="lbo2:56pBK14tHBv" resolve="elem" />
@@ -1416,10 +1425,28 @@
             <node concept="3cqJkl" id="56pBK14vZ$Y" role="3cqGtW">
               <node concept="3clFbS" id="56pBK14vZ$Z" role="2VODD2">
                 <node concept="3clFbF" id="56pBK14vZAJ" role="3cqZAp">
-                  <node concept="2OqwBi" id="56pBK14vZQA" role="3clFbG">
-                    <node concept="2ZBlsa" id="56pBK14vZAI" role="2Oq$k0" />
-                    <node concept="liA8E" id="56pBK14vZSe" role="2OqNvi">
-                      <ref role="37wK5l" to="c17a:~SAbstractConcept.getQualifiedName()" resolve="getQualifiedName" />
+                  <node concept="3cpWs3" id="5l6J5csSeog" role="3clFbG">
+                    <node concept="2OqwBi" id="5l6J5csSeH4" role="3uHU7w">
+                      <node concept="2ZBlsa" id="5l6J5csSeuo" role="2Oq$k0" />
+                      <node concept="liA8E" id="5l6J5csSeWP" role="2OqNvi">
+                        <ref role="37wK5l" to="c17a:~SAbstractConcept.getName()" resolve="getName" />
+                      </node>
+                    </node>
+                    <node concept="3cpWs3" id="5l6J5csSdQc" role="3uHU7B">
+                      <node concept="2OqwBi" id="5l6J5csSdmn" role="3uHU7B">
+                        <node concept="2OqwBi" id="56pBK14vZQA" role="2Oq$k0">
+                          <node concept="2ZBlsa" id="56pBK14vZAI" role="2Oq$k0" />
+                          <node concept="liA8E" id="56pBK14vZSe" role="2OqNvi">
+                            <ref role="37wK5l" to="c17a:~SAbstractConcept.getLanguage()" resolve="getLanguage" />
+                          </node>
+                        </node>
+                        <node concept="liA8E" id="5l6J5csSdyM" role="2OqNvi">
+                          <ref role="37wK5l" to="c17a:~SLanguage.getQualifiedName()" resolve="getQualifiedName" />
+                        </node>
+                      </node>
+                      <node concept="Xl_RD" id="5l6J5csSdRM" role="3uHU7w">
+                        <property role="Xl_RC" value="." />
+                      </node>
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.listeners.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.listeners.mps
deleted file mode 100644
index 5fc7ffb75..000000000
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.listeners.mps
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:a2b7ada6-28a8-4bc2-875a-7d65b09d91cc(com.mbeddr.formal.safety.gsn.ext.listeners)">
-  <persistence version="9" />
-  <languages>
-    <use id="309e0004-4976-4416-b947-ec02ae4ecef2" name="com.mbeddr.mpsutil.modellisteners" version="0" />
-    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
-  </languages>
-  <imports>
-    <import index="iihn" ref="r:1ca0ad9f-f283-47a0-9785-0fcac08d0fee(com.mbeddr.formal.base.prefixed_names_utils)" />
-    <import index="lbo2" ref="r:0f81d0ca-0757-4ee3-8a9a-ba988c2c39e3(com.mbeddr.formal.safety.gsn.ext.structure)" implicit="true" />
-  </imports>
-  <registry>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
-        <child id="1137022507850" name="body" index="2VODD2" />
-      </concept>
-      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
-        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
-      </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="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>
-    </language>
-    <language id="309e0004-4976-4416-b947-ec02ae4ecef2" name="com.mbeddr.mpsutil.modellisteners">
-      <concept id="5818559022137760597" name="com.mbeddr.mpsutil.modellisteners.structure.Parameter_instance" flags="ng" index="j_vvf" />
-      <concept id="5818559022137597839" name="com.mbeddr.mpsutil.modellisteners.structure.ConceptModelListeners" flags="ng" index="jA7cl">
-        <reference id="1213093996982" name="concept" index="1M2myG" />
-        <child id="5818559022137986141" name="listeners" index="j$A37" />
-      </concept>
-      <concept id="6105788070833315443" name="com.mbeddr.mpsutil.modellisteners.structure.PropertyListener" flags="ig" index="3vq$el" />
-    </language>
-  </registry>
-  <node concept="jA7cl" id="4bL3rTRC37n">
-    <ref role="1M2myG" to="lbo2:1qrXfdH1Uhb" resolve="PatternDefinition" />
-    <node concept="3vq$el" id="4bL3rTRC38i" role="j$A37">
-      <node concept="3clFbS" id="4bL3rTRC38j" role="2VODD2">
-        <node concept="3clFbF" id="33rrvp3CTtj" role="3cqZAp">
-          <node concept="2YIFZM" id="3QMOguhhmPL" role="3clFbG">
-            <ref role="1Pybhc" to="iihn:33rrvp3Cvkb" resolve="PrefixFixingUtils" />
-            <ref role="37wK5l" to="iihn:33rrvp3CyGy" resolve="fixPrefix" />
-            <node concept="j_vvf" id="33rrvp3CTuu" role="37wK5m" />
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-</model>
-
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/com.mbeddr.formal.safety.gsn.patterns.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/com.mbeddr.formal.safety.gsn.patterns.mpl
index c788e6602..a26b9ecf3 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/com.mbeddr.formal.safety.gsn.patterns.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/com.mbeddr.formal.safety.gsn.patterns.mpl
@@ -11,66 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="com.mbeddr.formal.safety.gsn.patterns#01" uuid="9f919b54-15e2-4ebd-9a07-b9f482bdf981">
-      <models>
-        <modelRoot contentPath="${module}/generator/template" type="default">
-          <sourceRoot location="." />
-        </modelRoot>
-      </models>
-      <facets>
-        <facet type="java">
-          <classes generated="true" path="${module}/generator/classes_gen" />
-        </facet>
-      </facets>
-      <external-templates />
-      <languageVersions>
-        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-        <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
-        <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
-        <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
-        <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
-        <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <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>
-        <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
-        <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-        <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
-        <module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
-        <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
-        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-        <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
-        <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
-        <module reference="e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)" version="0" />
-        <module reference="f465db4c-63d4-40ef-afda-acd713dc19a1(com.mbeddr.formal.safety.gsn.patterns)" version="0" />
-        <module reference="9f919b54-15e2-4ebd-9a07-b9f482bdf981(com.mbeddr.formal.safety.gsn.patterns#01)" 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" />
-        <module reference="8ca79d43-eb45-4791-bdd4-0d6130ff895b(de.itemis.mps.editor.diagram.layout)" version="0" />
-        <module reference="1144260c-e9a5-49a2-9add-39a1a1a7077e(de.itemis.mps.editor.diagram.runtime)" version="0" />
-        <module reference="56c81845-acaf-48a7-bcd8-e29b36c98dd7(de.itemis.mps.editor.diagram.styles)" version="0" />
-        <module reference="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
-        <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
-        <module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
-        <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
-        <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
-        <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
-        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-      </dependencyVersions>
-      <mapping-priorities />
-    </generator>
-  </generators>
   <sourcePath />
   <dependencies>
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/generator/template/main@generator.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/generator/template/main@generator.mps
deleted file mode 100644
index 26fc8e4fa..000000000
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/generator/template/main@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:4a938c72-a9a5-4c6e-97a8-a040cd6b251e(main@generator)">
-  <persistence version="9" />
-  <languages>
-    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
-  </languages>
-  <imports>
-    <import index="2qxf" ref="r:92bf1daa-4510-4ff1-a9b1-c695f68c3f1d(com.mbeddr.formal.safety.gsn.patterns.structure)" />
-  </imports>
-  <registry>
-    <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
-      <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
-    </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>
-  </registry>
-  <node concept="bUwia" id="7bxPmtp5iIY">
-    <property role="TrG5h" value="main" />
-  </node>
-</model>
-
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps
index 00aa24b94..af07ea7d7 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps
@@ -226,7 +226,9 @@
       <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
-      <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
+      <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY">
+        <child id="5861024100072578575" name="addHints" index="3xwHhi" />
+      </concept>
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR">
         <child id="7279578193766667846" name="addHints" index="78xua" />
         <child id="1182233390675" name="filter" index="12AuX0" />
@@ -878,37 +880,8 @@
       </node>
       <node concept="2iRkQZ" id="3GRi4m$qQ5t" role="2iSdaV" />
     </node>
-    <node concept="3EZMnI" id="3f8ZVRYdwpS" role="6VMZX">
-      <node concept="2iRkQZ" id="3f8ZVRYdwpT" role="2iSdaV" />
-      <node concept="PMmxH" id="3QMOguhhzzH" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:3QMOguhhzhR" resolve="IContainerForEntitiesWithPrefixedNamesEditorComponent" />
-      </node>
-      <node concept="3F0ifn" id="5WyjFZRl1g7" role="3EZMnx" />
-      <node concept="3EZMnI" id="5WyjFZRl1gs" role="3EZMnx">
-        <node concept="VPM3Z" id="5WyjFZRl1gu" role="3F10Kt" />
-        <node concept="3F0ifn" id="5WyjFZRl1gw" role="3EZMnx">
-          <property role="3F0ifm" value="Show Relations Text:" />
-        </node>
-        <node concept="27S6Sx" id="5WyjFZRl1hd" role="3EZMnx">
-          <ref role="1NtTu8" to="py52:5WyjFZRl16s" resolve="displayRelationNames" />
-        </node>
-        <node concept="2iRfu4" id="5WyjFZRl1gx" role="2iSdaV" />
-      </node>
-      <node concept="3F0ifn" id="3cGyC6fDROD" role="3EZMnx" />
-      <node concept="PMmxH" id="3cGyC6fEQ4A" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:3cGyC6fA47W" resolve="AnnotationProvidersContainerEditorComponent" />
-      </node>
-      <node concept="3F0ifn" id="336$aoT_0OY" role="3EZMnx" />
-      <node concept="3EZMnI" id="336$aoT_0Pl" role="3EZMnx">
-        <node concept="VPM3Z" id="336$aoT_0Pn" role="3F10Kt" />
-        <node concept="3F0ifn" id="336$aoT_0Pp" role="3EZMnx">
-          <property role="3F0ifm" value="Documentation:" />
-        </node>
-        <node concept="3F1sOY" id="336$aoT_0PK" role="3EZMnx">
-          <ref role="1NtTu8" to="py52:336$aoT$ZLb" resolve="documentation" />
-        </node>
-        <node concept="2iRfu4" id="336$aoT_0Pq" role="2iSdaV" />
-      </node>
+    <node concept="PMmxH" id="3ydH56R7Q$p" role="6VMZX">
+      <ref role="PMmxG" node="3ydH56R7QiE" resolve="GoalStructureInInspector_EditorComponent" />
     </node>
   </node>
   <node concept="2xDbr0" id="4Te4zGtlJMP">
@@ -3150,6 +3123,7 @@
         </node>
         <node concept="3F0ifn" id="6xcemMvtSWJ" role="3EZMnx">
           <property role="3F0ifm" value=":" />
+          <ref role="1k5W1q" node="4HjFLZ$nN39" resolve="GSNBaseLanguageKeyword" />
           <node concept="11L4FC" id="6xcemMvuhWL" role="3F10Kt">
             <property role="VOm3f" value="true" />
           </node>
@@ -3361,6 +3335,7 @@
         </node>
         <node concept="3F0ifn" id="4doguZRxAU" role="3EZMnx">
           <property role="3F0ifm" value=":" />
+          <ref role="1k5W1q" node="4HjFLZ$nN39" resolve="GSNBaseLanguageKeyword" />
           <node concept="11L4FC" id="4doguZRxAV" role="3F10Kt">
             <property role="VOm3f" value="true" />
           </node>
@@ -3419,6 +3394,7 @@
         </node>
         <node concept="3F0ifn" id="4doguZRxAN" role="3EZMnx">
           <property role="3F0ifm" value=":" />
+          <ref role="1k5W1q" node="4HjFLZ$nN39" resolve="GSNBaseLanguageKeyword" />
           <node concept="11L4FC" id="4doguZRxAO" role="3F10Kt">
             <property role="VOm3f" value="true" />
           </node>
@@ -3501,6 +3477,7 @@
         </node>
         <node concept="3F0ifn" id="4doguZRxm2" role="3EZMnx">
           <property role="3F0ifm" value=":" />
+          <ref role="1k5W1q" node="4HjFLZ$nN39" resolve="GSNBaseLanguageKeyword" />
           <node concept="11L4FC" id="4doguZRxoH" role="3F10Kt">
             <property role="VOm3f" value="true" />
           </node>
@@ -3544,6 +3521,7 @@
         </node>
         <node concept="3F0ifn" id="4doguZRxB1" role="3EZMnx">
           <property role="3F0ifm" value=":" />
+          <ref role="1k5W1q" node="4HjFLZ$nN39" resolve="GSNBaseLanguageKeyword" />
           <node concept="11L4FC" id="4doguZRxB2" role="3F10Kt">
             <property role="VOm3f" value="true" />
           </node>
@@ -5057,6 +5035,9 @@
     <node concept="2aJ2om" id="5uFV_KKBkOT" role="CpUAK">
       <ref role="2$4xQ3" node="5uFV_KKBhnn" resolve="GOAL_STRUCTURE_TEXTUAL" />
     </node>
+    <node concept="PMmxH" id="3ydH56R9VXv" role="6VMZX">
+      <ref role="PMmxG" node="3ydH56R7QiE" resolve="GoalStructureInInspector_EditorComponent" />
+    </node>
   </node>
   <node concept="24kQdi" id="5uFV_KKBleS">
     <property role="3GE5qa" value="textual" />
@@ -9305,6 +9286,9 @@
       </node>
       <node concept="2iRkQZ" id="7olAlesPk0L" role="2iSdaV" />
     </node>
+    <node concept="PMmxH" id="3ydH56R8Uk2" role="6VMZX">
+      <ref role="PMmxG" node="3ydH56R7QiE" resolve="GoalStructureInInspector_EditorComponent" />
+    </node>
   </node>
   <node concept="24kQdi" id="7olAlesPkOF">
     <property role="3GE5qa" value="textual_fast" />
@@ -10456,6 +10440,7 @@
         </node>
         <node concept="3F0ifn" id="4doguZRxAG" role="3EZMnx">
           <property role="3F0ifm" value=":" />
+          <ref role="1k5W1q" node="4HjFLZ$nN39" resolve="GSNBaseLanguageKeyword" />
           <node concept="11L4FC" id="4doguZRxAH" role="3F10Kt">
             <property role="VOm3f" value="true" />
           </node>
@@ -10658,6 +10643,9 @@
     <node concept="2aJ2om" id="4Cms47V7voF" role="CpUAK">
       <ref role="2$4xQ3" node="4Cms47V74xp" resolve="GOAL_STRUCTURE_TREE_TABLE" />
     </node>
+    <node concept="PMmxH" id="3ydH56R8T$L" role="6VMZX">
+      <ref role="PMmxG" node="3ydH56R7QiE" resolve="GoalStructureInInspector_EditorComponent" />
+    </node>
   </node>
   <node concept="312cEu" id="48_A4oXEn4j">
     <property role="3GE5qa" value="tree_fast" />
@@ -12525,6 +12513,9 @@
       </node>
       <node concept="2iRkQZ" id="3EDV2YKNkzu" role="2iSdaV" />
     </node>
+    <node concept="PMmxH" id="3ydH56R8TXq" role="6VMZX">
+      <ref role="PMmxG" node="3ydH56R7QiE" resolve="GoalStructureInInspector_EditorComponent" />
+    </node>
   </node>
   <node concept="24kQdi" id="5t37uj6yZi$">
     <ref role="1XX52x" to="py52:5t37uj6yZix" resolve="GoalStructureRef" />
@@ -12956,5 +12947,58 @@
       <ref role="2$4xQ3" node="3EDV2YKAndh" resolve="GOAL_STRUCTURE_DIFF_VIEW" />
     </node>
   </node>
+  <node concept="PKFIW" id="3ydH56R7QiE">
+    <property role="TrG5h" value="GoalStructureInInspector_EditorComponent" />
+    <ref role="1XX52x" to="py52:3GRi4m$qNsQ" resolve="GoalStructure" />
+    <node concept="3EZMnI" id="3ydH56R7QiN" role="2wV5jI">
+      <node concept="2iRkQZ" id="3ydH56R7QiO" role="2iSdaV" />
+      <node concept="PMmxH" id="3ydH56R7QiP" role="3EZMnx">
+        <ref role="PMmxG" to="xnej:3QMOguhhzhR" resolve="IContainerForEntitiesWithPrefixedNamesEditorComponent" />
+      </node>
+      <node concept="3F0ifn" id="3ydH56R7QiQ" role="3EZMnx" />
+      <node concept="3EZMnI" id="3ydH56R7QiR" role="3EZMnx">
+        <node concept="VPM3Z" id="3ydH56R7QiS" role="3F10Kt" />
+        <node concept="3F0ifn" id="3ydH56R7QiT" role="3EZMnx">
+          <property role="3F0ifm" value="Show Relations Text:" />
+        </node>
+        <node concept="27S6Sx" id="3ydH56R7QiU" role="3EZMnx">
+          <ref role="1NtTu8" to="py52:5WyjFZRl16s" resolve="displayRelationNames" />
+        </node>
+        <node concept="2iRfu4" id="3ydH56R7QiV" role="2iSdaV" />
+      </node>
+      <node concept="3F0ifn" id="3ydH56R7QiW" role="3EZMnx" />
+      <node concept="PMmxH" id="3ydH56R7QiX" role="3EZMnx">
+        <ref role="PMmxG" to="xnej:3cGyC6fA47W" resolve="AnnotationProvidersContainerEditorComponent" />
+      </node>
+      <node concept="3F0ifn" id="3ydH56R7QiY" role="3EZMnx" />
+      <node concept="3EZMnI" id="3ydH56R7QiZ" role="3EZMnx">
+        <node concept="VPM3Z" id="3ydH56R7Qj0" role="3F10Kt" />
+        <node concept="3F0ifn" id="3ydH56R7Qj1" role="3EZMnx">
+          <property role="3F0ifm" value="Documentation:" />
+        </node>
+        <node concept="3F1sOY" id="3ydH56R7Qj2" role="3EZMnx">
+          <ref role="1NtTu8" to="py52:336$aoT$ZLb" resolve="documentation" />
+          <node concept="2w$q5c" id="5l6J5csz8uE" role="3xwHhi">
+            <node concept="2aJ2om" id="5l6J5csz8uF" role="2w$qW5">
+              <ref role="2$4xQ3" node="5uFV_KKBhnn" resolve="GOAL_STRUCTURE_TEXTUAL" />
+            </node>
+          </node>
+          <node concept="VPXOz" id="5l6J5cs$87w" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+        <node concept="2iRfu4" id="3ydH56R7Qj3" role="2iSdaV" />
+      </node>
+    </node>
+  </node>
+  <node concept="24kQdi" id="5l6J5csz8l6">
+    <ref role="1XX52x" to="py52:336$aoT_UFY" resolve="GoalStructureDoc" />
+    <node concept="3F1sOY" id="5l6J5csz8la" role="2wV5jI">
+      <ref role="1NtTu8" to="py52:336$aoT_UHh" resolve="documentation" />
+    </node>
+    <node concept="2aJ2om" id="5l6J5csz8l8" role="CpUAK">
+      <ref role="2$4xQ3" node="5uFV_KKBhnn" resolve="GOAL_STRUCTURE_TEXTUAL" />
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.intentions.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.intentions.mps
index f5716502b..dd6026ccc 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.intentions.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.intentions.mps
@@ -3633,7 +3633,6 @@
                 <node concept="3uibUv" id="47PB7GsJuIX" role="1tU5fm">
                   <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                 </node>
-                <node concept="10Nm6u" id="1HYO_kmJV6R" role="33vP2m" />
               </node>
             </node>
             <node concept="3clFbJ" id="47PB7GsJUzQ" role="3cqZAp">
@@ -4383,53 +4382,47 @@
               <node concept="3clFbS" id="47PB7GsLWmJ" role="3clFbx">
                 <node concept="3clFbJ" id="47PB7GsM1Jg" role="3cqZAp">
                   <node concept="3clFbS" id="47PB7GsM1Jh" role="3clFbx">
-                    <node concept="3cpWs8" id="47PB7GsMpqi" role="3cqZAp">
-                      <node concept="3cpWsn" id="47PB7GsMpqh" role="3cpWs9">
-                        <property role="TrG5h" value="edge" />
-                        <node concept="3uibUv" id="47PB7GsMpqj" role="1tU5fm">
-                          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                    <node concept="3clFbF" id="5l6J5csLTy1" role="3cqZAp">
+                      <node concept="2OqwBi" id="5l6J5csLTy3" role="3clFbG">
+                        <node concept="37vLTw" id="5l6J5csLTy4" role="2Oq$k0">
+                          <ref role="3cqZAo" node="47PB7GsIWlu" resolve="graph" />
                         </node>
-                        <node concept="2OqwBi" id="47PB7GsMru5" role="33vP2m">
-                          <node concept="37vLTw" id="47PB7GsMru4" role="2Oq$k0">
-                            <ref role="3cqZAo" node="47PB7GsIWlu" resolve="graph" />
+                        <node concept="liA8E" id="5l6J5csLTy5" role="2OqNvi">
+                          <ref role="37wK5l" to="1njx:~mxGraph.insertEdge(java.lang.Object,java.lang.String,java.lang.Object,java.lang.Object,java.lang.Object)" resolve="insertEdge" />
+                          <node concept="37vLTw" id="5l6J5csLTy6" role="37wK5m">
+                            <ref role="3cqZAo" node="47PB7GsIWlw" resolve="parent" />
                           </node>
-                          <node concept="liA8E" id="47PB7GsMru6" role="2OqNvi">
-                            <ref role="37wK5l" to="1njx:~mxGraph.insertEdge(java.lang.Object,java.lang.String,java.lang.Object,java.lang.Object,java.lang.Object)" resolve="insertEdge" />
-                            <node concept="37vLTw" id="47PB7GsMru7" role="37wK5m">
-                              <ref role="3cqZAo" node="47PB7GsIWlw" resolve="parent" />
-                            </node>
-                            <node concept="10Nm6u" id="47PB7GsMru8" role="37wK5m" />
-                            <node concept="Xl_RD" id="47PB7GsMru9" role="37wK5m">
-                              <property role="Xl_RC" value="" />
-                            </node>
-                            <node concept="3EllGN" id="47PB7GsMxG_" role="37wK5m">
-                              <node concept="2OqwBi" id="47PB7GsNxFc" role="3ElVtu">
-                                <node concept="2OqwBi" id="47PB7GsNl8x" role="2Oq$k0">
-                                  <node concept="2OqwBi" id="47PB7GsNhec" role="2Oq$k0">
-                                    <node concept="2GrUjf" id="47PB7GsNfiT" role="2Oq$k0">
-                                      <ref role="2Gs0qQ" node="47PB7GsLTcI" resolve="element" />
-                                    </node>
-                                    <node concept="2qgKlT" id="47PB7GsNiot" role="2OqNvi">
-                                      <ref role="37wK5l" to="89jy:71GfFl7iCHN" resolve="getInboundConnections" />
-                                    </node>
+                          <node concept="10Nm6u" id="5l6J5csLTy7" role="37wK5m" />
+                          <node concept="Xl_RD" id="5l6J5csLTy8" role="37wK5m">
+                            <property role="Xl_RC" value="" />
+                          </node>
+                          <node concept="3EllGN" id="5l6J5csLTy9" role="37wK5m">
+                            <node concept="2OqwBi" id="5l6J5csLTya" role="3ElVtu">
+                              <node concept="2OqwBi" id="5l6J5csLTyb" role="2Oq$k0">
+                                <node concept="2OqwBi" id="5l6J5csLTyc" role="2Oq$k0">
+                                  <node concept="2GrUjf" id="5l6J5csLTyd" role="2Oq$k0">
+                                    <ref role="2Gs0qQ" node="47PB7GsLTcI" resolve="element" />
+                                  </node>
+                                  <node concept="2qgKlT" id="5l6J5csLTye" role="2OqNvi">
+                                    <ref role="37wK5l" to="89jy:71GfFl7iCHN" resolve="getInboundConnections" />
                                   </node>
-                                  <node concept="1uHKPH" id="47PB7GsNwcI" role="2OqNvi" />
-                                </node>
-                                <node concept="3TrEf2" id="47PB7GsNzmj" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="py52:2ccN23odOzl" resolve="source" />
                                 </node>
+                                <node concept="1uHKPH" id="5l6J5csLTyf" role="2OqNvi" />
                               </node>
-                              <node concept="37vLTw" id="47PB7GsMvZg" role="3ElQJh">
-                                <ref role="3cqZAo" node="47PB7GsISmz" resolve="object2Gseb" />
+                              <node concept="3TrEf2" id="5l6J5csLTyg" role="2OqNvi">
+                                <ref role="3Tt5mk" to="py52:2ccN23odOzl" resolve="source" />
                               </node>
                             </node>
-                            <node concept="3EllGN" id="47PB7GsMXN8" role="37wK5m">
-                              <node concept="2GrUjf" id="47PB7GsMZJl" role="3ElVtu">
-                                <ref role="2Gs0qQ" node="47PB7GsLTcI" resolve="element" />
-                              </node>
-                              <node concept="37vLTw" id="47PB7GsMruW" role="3ElQJh">
-                                <ref role="3cqZAo" node="47PB7GsISmz" resolve="object2Gseb" />
-                              </node>
+                            <node concept="37vLTw" id="5l6J5csLTyh" role="3ElQJh">
+                              <ref role="3cqZAo" node="47PB7GsISmz" resolve="object2Gseb" />
+                            </node>
+                          </node>
+                          <node concept="3EllGN" id="5l6J5csLTyi" role="37wK5m">
+                            <node concept="2GrUjf" id="5l6J5csLTyj" role="3ElVtu">
+                              <ref role="2Gs0qQ" node="47PB7GsLTcI" resolve="element" />
+                            </node>
+                            <node concept="37vLTw" id="5l6J5csLTyk" role="3ElQJh">
+                              <ref role="3cqZAo" node="47PB7GsISmz" resolve="object2Gseb" />
                             </node>
                           </node>
                         </node>
@@ -4471,77 +4464,71 @@
                   </node>
                   <node concept="3eNFk2" id="47PB7GsN1hL" role="3eNLev">
                     <node concept="3clFbS" id="47PB7GsN1hN" role="3eOfB_">
-                      <node concept="3cpWs8" id="47PB7GsN5NE" role="3cqZAp">
-                        <node concept="3cpWsn" id="47PB7GsN5NH" role="3cpWs9">
-                          <property role="TrG5h" value="edge" />
-                          <node concept="3uibUv" id="47PB7GsN5NI" role="1tU5fm">
-                            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                      <node concept="3clFbF" id="5l6J5csMeSR" role="3cqZAp">
+                        <node concept="2OqwBi" id="5l6J5csMeST" role="3clFbG">
+                          <node concept="37vLTw" id="5l6J5csMeSU" role="2Oq$k0">
+                            <ref role="3cqZAo" node="47PB7GsIWlu" resolve="graph" />
                           </node>
-                          <node concept="2OqwBi" id="47PB7GsN5NJ" role="33vP2m">
-                            <node concept="37vLTw" id="47PB7GsN5NK" role="2Oq$k0">
-                              <ref role="3cqZAo" node="47PB7GsIWlu" resolve="graph" />
+                          <node concept="liA8E" id="5l6J5csMeSV" role="2OqNvi">
+                            <ref role="37wK5l" to="1njx:~mxGraph.insertEdge(java.lang.Object,java.lang.String,java.lang.Object,java.lang.Object,java.lang.Object)" resolve="insertEdge" />
+                            <node concept="37vLTw" id="5l6J5csMeSW" role="37wK5m">
+                              <ref role="3cqZAo" node="47PB7GsIWlw" resolve="parent" />
                             </node>
-                            <node concept="liA8E" id="47PB7GsN5NL" role="2OqNvi">
-                              <ref role="37wK5l" to="1njx:~mxGraph.insertEdge(java.lang.Object,java.lang.String,java.lang.Object,java.lang.Object,java.lang.Object)" resolve="insertEdge" />
-                              <node concept="37vLTw" id="47PB7GsN5NM" role="37wK5m">
-                                <ref role="3cqZAo" node="47PB7GsIWlw" resolve="parent" />
-                              </node>
-                              <node concept="10Nm6u" id="47PB7GsN5NN" role="37wK5m" />
-                              <node concept="Xl_RD" id="47PB7GsN5NO" role="37wK5m">
-                                <property role="Xl_RC" value="" />
-                              </node>
-                              <node concept="3EllGN" id="47PB7GsN5NP" role="37wK5m">
-                                <node concept="2OqwBi" id="47PB7GsN5NQ" role="3ElVtu">
-                                  <node concept="2OqwBi" id="47PB7GsN5NR" role="2Oq$k0">
-                                    <node concept="2OqwBi" id="47PB7GsN5NS" role="2Oq$k0">
-                                      <node concept="2GrUjf" id="47PB7GsN5NT" role="2Oq$k0">
-                                        <ref role="2Gs0qQ" node="47PB7GsLTcI" resolve="element" />
-                                      </node>
-                                      <node concept="I4A8Y" id="47PB7GsN5NU" role="2OqNvi" />
+                            <node concept="10Nm6u" id="5l6J5csMeSX" role="37wK5m" />
+                            <node concept="Xl_RD" id="5l6J5csMeSY" role="37wK5m">
+                              <property role="Xl_RC" value="" />
+                            </node>
+                            <node concept="3EllGN" id="5l6J5csMeSZ" role="37wK5m">
+                              <node concept="2OqwBi" id="5l6J5csMeT0" role="3ElVtu">
+                                <node concept="2OqwBi" id="5l6J5csMeT1" role="2Oq$k0">
+                                  <node concept="2OqwBi" id="5l6J5csMeT2" role="2Oq$k0">
+                                    <node concept="2GrUjf" id="5l6J5csMeT3" role="2Oq$k0">
+                                      <ref role="2Gs0qQ" node="47PB7GsLTcI" resolve="element" />
                                     </node>
-                                    <node concept="1j9C0f" id="47PB7GsN5NV" role="2OqNvi">
-                                      <node concept="chp4Y" id="47PB7GsN5NW" role="3MHPCF">
-                                        <ref role="cht4Q" to="py52:3GRi4m$qNtH" resolve="Goal" />
-                                      </node>
+                                    <node concept="I4A8Y" id="5l6J5csMeT4" role="2OqNvi" />
+                                  </node>
+                                  <node concept="1j9C0f" id="5l6J5csMeT5" role="2OqNvi">
+                                    <node concept="chp4Y" id="5l6J5csMeT6" role="3MHPCF">
+                                      <ref role="cht4Q" to="py52:3GRi4m$qNtH" resolve="Goal" />
                                     </node>
                                   </node>
-                                  <node concept="1z4cxt" id="47PB7GsN5NX" role="2OqNvi">
-                                    <node concept="1bVj0M" id="47PB7GsN5NY" role="23t8la">
-                                      <node concept="3clFbS" id="47PB7GsN5NZ" role="1bW5cS">
-                                        <node concept="3clFbF" id="47PB7GsN5O0" role="3cqZAp">
-                                          <node concept="3clFbC" id="47PB7GsN5O1" role="3clFbG">
-                                            <node concept="2GrUjf" id="47PB7GsN5O2" role="3uHU7w">
-                                              <ref role="2Gs0qQ" node="47PB7GsLTcI" resolve="element" />
+                                </node>
+                                <node concept="1z4cxt" id="5l6J5csMeT7" role="2OqNvi">
+                                  <node concept="1bVj0M" id="5l6J5csMeT8" role="23t8la">
+                                    <node concept="3clFbS" id="5l6J5csMeT9" role="1bW5cS">
+                                      <node concept="3clFbF" id="5l6J5csMeTa" role="3cqZAp">
+                                        <node concept="3clFbC" id="5l6J5csMeTb" role="3clFbG">
+                                          <node concept="2GrUjf" id="5l6J5csMeTc" role="3uHU7w">
+                                            <ref role="2Gs0qQ" node="47PB7GsLTcI" resolve="element" />
+                                          </node>
+                                          <node concept="2OqwBi" id="5l6J5csMeTd" role="3uHU7B">
+                                            <node concept="37vLTw" id="5l6J5csMeTe" role="2Oq$k0">
+                                              <ref role="3cqZAo" node="5l6J5csMeTg" resolve="it" />
                                             </node>
-                                            <node concept="2OqwBi" id="47PB7GsN5O3" role="3uHU7B">
-                                              <node concept="37vLTw" id="47PB7GsN5O4" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="47PB7GsN5O6" resolve="it" />
-                                              </node>
-                                              <node concept="3TrEf2" id="47PB7GsN5O5" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="py52:4q8AAJKJQzF" resolve="goalDefinition" />
-                                              </node>
+                                            <node concept="3TrEf2" id="5l6J5csMeTf" role="2OqNvi">
+                                              <ref role="3Tt5mk" to="py52:4q8AAJKJQzF" resolve="goalDefinition" />
                                             </node>
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="47PB7GsN5O6" role="1bW2Oz">
-                                        <property role="TrG5h" value="it" />
-                                        <node concept="2jxLKc" id="47PB7GsN5O7" role="1tU5fm" />
-                                      </node>
+                                    </node>
+                                    <node concept="Rh6nW" id="5l6J5csMeTg" role="1bW2Oz">
+                                      <property role="TrG5h" value="it" />
+                                      <node concept="2jxLKc" id="5l6J5csMeTh" role="1tU5fm" />
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="37vLTw" id="47PB7GsN5O8" role="3ElQJh">
-                                  <ref role="3cqZAo" node="47PB7GsISmz" resolve="object2Gseb" />
-                                </node>
                               </node>
-                              <node concept="3EllGN" id="47PB7GsN5O9" role="37wK5m">
-                                <node concept="2GrUjf" id="47PB7GsN5Oa" role="3ElVtu">
-                                  <ref role="2Gs0qQ" node="47PB7GsLTcI" resolve="element" />
-                                </node>
-                                <node concept="37vLTw" id="47PB7GsN5Ob" role="3ElQJh">
-                                  <ref role="3cqZAo" node="47PB7GsISmz" resolve="object2Gseb" />
-                                </node>
+                              <node concept="37vLTw" id="5l6J5csMeTi" role="3ElQJh">
+                                <ref role="3cqZAo" node="47PB7GsISmz" resolve="object2Gseb" />
+                              </node>
+                            </node>
+                            <node concept="3EllGN" id="5l6J5csMeTj" role="37wK5m">
+                              <node concept="2GrUjf" id="5l6J5csMeTk" role="3ElVtu">
+                                <ref role="2Gs0qQ" node="47PB7GsLTcI" resolve="element" />
+                              </node>
+                              <node concept="37vLTw" id="5l6J5csMeTl" role="3ElQJh">
+                                <ref role="3cqZAo" node="47PB7GsISmz" resolve="object2Gseb" />
                               </node>
                             </node>
                           </node>
@@ -4562,53 +4549,47 @@
                   </node>
                   <node concept="3eNFk2" id="47PB7GsN$fE" role="3eNLev">
                     <node concept="3clFbS" id="47PB7GsN$fG" role="3eOfB_">
-                      <node concept="3cpWs8" id="47PB7GsN_Lf" role="3cqZAp">
-                        <node concept="3cpWsn" id="47PB7GsN_Li" role="3cpWs9">
-                          <property role="TrG5h" value="edge" />
-                          <node concept="3uibUv" id="47PB7GsN_Lj" role="1tU5fm">
-                            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                      <node concept="3clFbF" id="5l6J5csMypf" role="3cqZAp">
+                        <node concept="2OqwBi" id="5l6J5csMyph" role="3clFbG">
+                          <node concept="37vLTw" id="5l6J5csMypi" role="2Oq$k0">
+                            <ref role="3cqZAo" node="47PB7GsIWlu" resolve="graph" />
                           </node>
-                          <node concept="2OqwBi" id="47PB7GsN_Lk" role="33vP2m">
-                            <node concept="37vLTw" id="47PB7GsN_Ll" role="2Oq$k0">
-                              <ref role="3cqZAo" node="47PB7GsIWlu" resolve="graph" />
+                          <node concept="liA8E" id="5l6J5csMypj" role="2OqNvi">
+                            <ref role="37wK5l" to="1njx:~mxGraph.insertEdge(java.lang.Object,java.lang.String,java.lang.Object,java.lang.Object,java.lang.Object)" resolve="insertEdge" />
+                            <node concept="37vLTw" id="5l6J5csMypk" role="37wK5m">
+                              <ref role="3cqZAo" node="47PB7GsIWlw" resolve="parent" />
                             </node>
-                            <node concept="liA8E" id="47PB7GsN_Lm" role="2OqNvi">
-                              <ref role="37wK5l" to="1njx:~mxGraph.insertEdge(java.lang.Object,java.lang.String,java.lang.Object,java.lang.Object,java.lang.Object)" resolve="insertEdge" />
-                              <node concept="37vLTw" id="47PB7GsN_Ln" role="37wK5m">
-                                <ref role="3cqZAo" node="47PB7GsIWlw" resolve="parent" />
-                              </node>
-                              <node concept="10Nm6u" id="47PB7GsN_Lo" role="37wK5m" />
-                              <node concept="Xl_RD" id="47PB7GsN_Lp" role="37wK5m">
-                                <property role="Xl_RC" value="" />
-                              </node>
-                              <node concept="3EllGN" id="47PB7GsN_Lq" role="37wK5m">
-                                <node concept="2OqwBi" id="47PB7GsN_Lr" role="3ElVtu">
-                                  <node concept="2OqwBi" id="47PB7GsN_Ls" role="2Oq$k0">
-                                    <node concept="2OqwBi" id="47PB7GsN_Lt" role="2Oq$k0">
-                                      <node concept="2GrUjf" id="47PB7GsN_Lu" role="2Oq$k0">
-                                        <ref role="2Gs0qQ" node="47PB7GsLTcI" resolve="element" />
-                                      </node>
-                                      <node concept="2qgKlT" id="47PB7GsN_Lv" role="2OqNvi">
-                                        <ref role="37wK5l" to="89jy:71GfFl7iCHN" resolve="getInboundConnections" />
-                                      </node>
+                            <node concept="10Nm6u" id="5l6J5csMypl" role="37wK5m" />
+                            <node concept="Xl_RD" id="5l6J5csMypm" role="37wK5m">
+                              <property role="Xl_RC" value="" />
+                            </node>
+                            <node concept="3EllGN" id="5l6J5csMypn" role="37wK5m">
+                              <node concept="2OqwBi" id="5l6J5csMypo" role="3ElVtu">
+                                <node concept="2OqwBi" id="5l6J5csMypp" role="2Oq$k0">
+                                  <node concept="2OqwBi" id="5l6J5csMypq" role="2Oq$k0">
+                                    <node concept="2GrUjf" id="5l6J5csMypr" role="2Oq$k0">
+                                      <ref role="2Gs0qQ" node="47PB7GsLTcI" resolve="element" />
+                                    </node>
+                                    <node concept="2qgKlT" id="5l6J5csMyps" role="2OqNvi">
+                                      <ref role="37wK5l" to="89jy:71GfFl7iCHN" resolve="getInboundConnections" />
                                     </node>
-                                    <node concept="1uHKPH" id="47PB7GsN_Lw" role="2OqNvi" />
-                                  </node>
-                                  <node concept="3TrEf2" id="47PB7GsN_Lx" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="py52:2ccN23odOzl" resolve="source" />
                                   </node>
+                                  <node concept="1uHKPH" id="5l6J5csMypt" role="2OqNvi" />
                                 </node>
-                                <node concept="37vLTw" id="47PB7GsN_Ly" role="3ElQJh">
-                                  <ref role="3cqZAo" node="47PB7GsISmz" resolve="object2Gseb" />
+                                <node concept="3TrEf2" id="5l6J5csMypu" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="py52:2ccN23odOzl" resolve="source" />
                                 </node>
                               </node>
-                              <node concept="3EllGN" id="47PB7GsN_Lz" role="37wK5m">
-                                <node concept="2GrUjf" id="47PB7GsN_L$" role="3ElVtu">
-                                  <ref role="2Gs0qQ" node="47PB7GsLTcI" resolve="element" />
-                                </node>
-                                <node concept="37vLTw" id="47PB7GsN_L_" role="3ElQJh">
-                                  <ref role="3cqZAo" node="47PB7GsISmz" resolve="object2Gseb" />
-                                </node>
+                              <node concept="37vLTw" id="5l6J5csMypv" role="3ElQJh">
+                                <ref role="3cqZAo" node="47PB7GsISmz" resolve="object2Gseb" />
+                              </node>
+                            </node>
+                            <node concept="3EllGN" id="5l6J5csMypw" role="37wK5m">
+                              <node concept="2GrUjf" id="5l6J5csMypx" role="3ElVtu">
+                                <ref role="2Gs0qQ" node="47PB7GsLTcI" resolve="element" />
+                              </node>
+                              <node concept="37vLTw" id="5l6J5csMypy" role="3ElQJh">
+                                <ref role="3cqZAo" node="47PB7GsISmz" resolve="object2Gseb" />
                               </node>
                             </node>
                           </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.listeners.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.listeners.mps
deleted file mode 100644
index 7e2459df6..000000000
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.listeners.mps
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:fb5b6819-6434-47ed-a169-7d93d1c8bee7(com.mbeddr.formal.safety.gsn.listeners)">
-  <persistence version="9" />
-  <languages>
-    <use id="309e0004-4976-4416-b947-ec02ae4ecef2" name="com.mbeddr.mpsutil.modellisteners" version="0" />
-    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
-  </languages>
-  <imports>
-    <import index="nf7v" ref="r:323f2e16-a77b-4958-b026-25202f82daa5(com.mbeddr.formal.safety.gsn.util)" />
-    <import index="b19z" ref="r:11a68676-9d63-4e1c-b920-59aefe77def3(com.mbeddr.formal.base.structure)" />
-    <import index="iihn" ref="r:1ca0ad9f-f283-47a0-9785-0fcac08d0fee(com.mbeddr.formal.base.prefixed_names_utils)" />
-    <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="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
-        <child id="1137022507850" name="body" index="2VODD2" />
-      </concept>
-      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
-        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
-      </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="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>
-    </language>
-    <language id="309e0004-4976-4416-b947-ec02ae4ecef2" name="com.mbeddr.mpsutil.modellisteners">
-      <concept id="5818559022137760597" name="com.mbeddr.mpsutil.modellisteners.structure.Parameter_instance" flags="ng" index="j_vvf" />
-      <concept id="5818559022137597839" name="com.mbeddr.mpsutil.modellisteners.structure.ConceptModelListeners" flags="ng" index="jA7cl">
-        <reference id="1213093996982" name="concept" index="1M2myG" />
-        <child id="5818559022137986141" name="listeners" index="j$A37" />
-      </concept>
-      <concept id="6105788070833315443" name="com.mbeddr.mpsutil.modellisteners.structure.PropertyListener" flags="ig" index="3vq$el">
-        <reference id="6105788070833315720" name="property" index="3vq$9I" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="jA7cl" id="33rrvp3CtYn">
-    <ref role="1M2myG" to="py52:3GRi4m$qNsQ" resolve="GoalStructure" />
-    <node concept="3vq$el" id="33rrvp3CtYo" role="j$A37">
-      <ref role="3vq$9I" to="b19z:3f8ZVRYdw4Q" resolve="idPrefix" />
-      <node concept="3clFbS" id="33rrvp3CtYp" role="2VODD2">
-        <node concept="3clFbF" id="33rrvp3CTtj" role="3cqZAp">
-          <node concept="2YIFZM" id="3QMOguhhmPL" role="3clFbG">
-            <ref role="37wK5l" to="iihn:33rrvp3CyGy" resolve="fixPrefix" />
-            <ref role="1Pybhc" to="iihn:33rrvp3Cvkb" resolve="PrefixFixingUtils" />
-            <node concept="j_vvf" id="33rrvp3CTuu" role="37wK5m" />
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-</model>
-
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 66632d7f0..9f2b0c7b0 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
@@ -88,21 +88,6 @@
       <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="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="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
         <reference id="1138056546658" name="link" index="3TtcxE" />
       </concept>
@@ -113,25 +98,6 @@
       </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="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="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="8352104482584315555" name="jetbrains.mps.lang.migration.structure.MigrationScript" flags="ig" index="3SyAh_">
         <property id="5820409521797704727" name="fromVersion" index="qMTe8" />
       </concept>
@@ -157,94 +123,6 @@
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
     </language>
   </registry>
-  <node concept="Z5qvL" id="3QMOguhheEG">
-    <property role="Z5qvQ" value="0" />
-    <property role="TrG5h" value="Migrate_MovePropertyUp_0" />
-    <property role="1AQGQl" value="Move property `idPrefix` to concept `IContainerForEntitiesWithPrefixedNames`" />
-    <node concept="Z4OXk" id="3QMOguhheER" role="Z5rET">
-      <node concept="2pBcaW" id="3QMOguhheEP" role="Z5P1v">
-        <property role="2pBcoG" value="3731513482755309878" />
-        <property role="2pBcow" value="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
-        <property role="2pBc3U" value="idPrefix_old" />
-      </node>
-      <node concept="2pBcaW" id="3QMOguhheEQ" role="Z5P1t">
-        <property role="2pBcoG" value="3731513482755309878" />
-        <property role="2pBcow" value="r:11a68676-9d63-4e1c-b920-59aefe77def3(com.mbeddr.formal.base.structure)" />
-        <property role="2pBc3U" value="idPrefix" />
-      </node>
-      <node concept="7a1rK" id="3QMOguhheEO" role="7agGg">
-        <node concept="2x5zR_" id="3QMOguhheEI" role="HTpAA">
-          <property role="2x5zRA" value="idPrefix_old" />
-          <property role="2x5zRo" value="sclz4splgwfq" />
-          <node concept="2x4n5u" id="3QMOguhheEJ" role="2x5zRt">
-            <property role="2x4mPI" value="GoalStructure" />
-            <property role="2x4n5l" value="wf26lk9us7jq" />
-            <node concept="2V$Bhx" id="3QMOguhheEK" 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 concept="2x5zR_" id="3QMOguhheEL" role="HTpA_">
-          <property role="2x5zRA" value="idPrefix" />
-          <property role="2x5zRo" value="sclz4splgwfq" />
-          <node concept="2x4n5u" id="3QMOguhheEM" role="2x5zRt">
-            <property role="2x4mPI" value="IContainerForEntitiesWithPrefixedNames" />
-            <property role="2x4o5l" value="true" />
-            <property role="2x4n5l" value="xrzkqmv64lio" />
-            <node concept="2V$Bhx" id="3QMOguhheEN" role="2x4n5j">
-              <property role="2V$B1T" value="83ed2dfe-f724-46cc-852a-dce086daee3f" />
-              <property role="2V$B1Q" value="com.mbeddr.formal.base" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="Z5qvL" id="3QMOguhheFm">
-    <property role="Z5qvQ" value="1" />
-    <property role="TrG5h" value="Migrate_MovePropertyUp_1" />
-    <property role="1AQGQl" value="Move property `crtMaxIndex` to concept `IContainerForEntitiesWithPrefixedNames`" />
-    <node concept="Z4OXk" id="3QMOguhheFx" role="Z5rET">
-      <node concept="2pBcaW" id="3QMOguhheFv" role="Z5P1v">
-        <property role="2pBcoG" value="3731513482755311319" />
-        <property role="2pBcow" value="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
-        <property role="2pBc3U" value="crtMaxIndex_old" />
-      </node>
-      <node concept="2pBcaW" id="3QMOguhheFw" role="Z5P1t">
-        <property role="2pBcoG" value="3731513482755311319" />
-        <property role="2pBcow" value="r:11a68676-9d63-4e1c-b920-59aefe77def3(com.mbeddr.formal.base.structure)" />
-        <property role="2pBc3U" value="crtMaxIndex" />
-      </node>
-      <node concept="7a1rK" id="3QMOguhheFu" role="7agGg">
-        <node concept="2x5zR_" id="3QMOguhheFo" role="HTpAA">
-          <property role="2x5zRA" value="crtMaxIndex_old" />
-          <property role="2x5zRo" value="sclz4splgxjr" />
-          <node concept="2x4n5u" id="3QMOguhheFp" role="2x5zRt">
-            <property role="2x4mPI" value="GoalStructure" />
-            <property role="2x4n5l" value="wf26lk9us7jq" />
-            <node concept="2V$Bhx" id="3QMOguhheFq" 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 concept="2x5zR_" id="3QMOguhheFr" role="HTpA_">
-          <property role="2x5zRA" value="crtMaxIndex" />
-          <property role="2x5zRo" value="sclz4splgxjr" />
-          <node concept="2x4n5u" id="3QMOguhheFs" role="2x5zRt">
-            <property role="2x4mPI" value="IContainerForEntitiesWithPrefixedNames" />
-            <property role="2x4o5l" value="true" />
-            <property role="2x4n5l" value="xrzkqmv64lio" />
-            <node concept="2V$Bhx" id="3QMOguhheFt" role="2x4n5j">
-              <property role="2V$B1T" value="83ed2dfe-f724-46cc-852a-dce086daee3f" />
-              <property role="2V$B1Q" value="com.mbeddr.formal.base" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="3SyAh_" id="3Px2xUV1pp7">
     <property role="qMTe8" value="2" />
     <property role="TrG5h" value="migrateAttributes" />
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 a25d73cdb..f0ea8f703 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,10 +30,7 @@
       </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="1225118929411" name="build" index="YLPcu" />
-        <property id="1225118933224" name="comment" index="YLQ7P" />
-      </concept>
+      <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>
@@ -143,24 +140,6 @@
         </node>
       </node>
     </node>
-    <node concept="1TJgyi" id="3f8ZVRYdw4Q" role="1TKVEl">
-      <property role="IQ2nx" value="3731513482755309878" />
-      <property role="TrG5h" value="idPrefix_old" />
-      <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
-      <node concept="asaX9" id="3QMOguhheEH" role="lGtFl">
-        <property role="YLQ7P" value="The property was moved to concept &quot;com.mbeddr.formal.base.structure.IContainerForEntitiesWithPrefixedNames&quot;" />
-        <property role="YLPcu" value="16.04.2022" />
-      </node>
-    </node>
-    <node concept="1TJgyi" id="3f8ZVRYdwrn" role="1TKVEl">
-      <property role="IQ2nx" value="3731513482755311319" />
-      <property role="TrG5h" value="crtMaxIndex_old" />
-      <ref role="AX2Wp" to="tpck:fKAQMTA" resolve="integer" />
-      <node concept="asaX9" id="3QMOguhheFn" role="lGtFl">
-        <property role="YLQ7P" value="The property was moved to concept &quot;com.mbeddr.formal.base.structure.IContainerForEntitiesWithPrefixedNames&quot;" />
-        <property role="YLPcu" value="16.04.2022" />
-      </node>
-    </node>
     <node concept="1TJgyi" id="5WyjFZRl16s" role="1TKVEl">
       <property role="IQ2nx" value="6855128169206518172" />
       <property role="TrG5h" value="displayRelationNames" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps
index fffad0bf0..4bd79571c 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps
@@ -3678,35 +3678,6 @@
             <ref role="1Busuk" node="6hyv0iVPlGt" resolve="com.mbeddr.formal.safety.gsn" />
           </node>
         </node>
-        <node concept="1yeLz9" id="1UGKBYPyc4W" role="1TViLv">
-          <property role="TrG5h" value="com.mbeddr.formal.safety.cae.generator" />
-          <property role="3LESm3" value="832c49e4-a4ce-4d15-b597-aeac59d83aff" />
-          <node concept="1BupzO" id="1UGKBYPyc5a" role="3bR31x">
-            <property role="3ZfqAx" value="generator/templates" />
-            <property role="1Hdu6h" value="true" />
-            <property role="1HemKv" value="true" />
-            <node concept="3LXTmp" id="1UGKBYPyc5b" role="1HemKq">
-              <node concept="398BVA" id="1UGKBYPyc4X" role="3LXTmr">
-                <ref role="398BVh" node="6hyv0iVPlDX" resolve="mbeddr.formal.safety.code" />
-                <node concept="2Ry0Ak" id="1UGKBYPyc4Y" role="iGT6I">
-                  <property role="2Ry0Am" value="languages" />
-                  <node concept="2Ry0Ak" id="1UGKBYPyc4Z" role="2Ry0An">
-                    <property role="2Ry0Am" value="com.mbeddr.formal.safety.cae" />
-                    <node concept="2Ry0Ak" id="1UGKBYPyc50" role="2Ry0An">
-                      <property role="2Ry0Am" value="generator" />
-                      <node concept="2Ry0Ak" id="1UGKBYPyc51" role="2Ry0An">
-                        <property role="2Ry0Am" value="templates" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3qWCbU" id="1UGKBYPyc5c" role="3LXTna">
-                <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3rtmxn" id="1UGKBYPycf0" role="3bR31x">
           <node concept="3LXTmp" id="1UGKBYPycf1" role="3rtmxm">
             <node concept="398BVA" id="1UGKBYPycf2" role="3LXTmr">
@@ -5503,6 +5474,11 @@
             <ref role="3bR37D" to="90a9:56Tfdun3uan" resolve="de.itemis.mps.editor.diagram.layout" />
           </node>
         </node>
+        <node concept="1SiIV0" id="_yKhEdNKS_" role="3bR37C">
+          <node concept="1Busua" id="_yKhEdNKSA" role="1SiIV1">
+            <ref role="1Busuk" node="6hyv0iVPlG3" resolve="com.mbeddr.formal.base" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="3rkUgzovbK_" role="2G$12L">
         <property role="BnDLt" value="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps
index cec1a18e7..e76cafea6 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps
@@ -8246,35 +8246,6 @@
             <ref role="3bR37D" node="42jqVeFkUuV" resolve="com.mbeddr.formal.base" />
           </node>
         </node>
-        <node concept="1yeLz9" id="7he_lUur$vn" role="1TViLv">
-          <property role="TrG5h" value="com.mbeddr.formal.safety.gsn.patterns#01" />
-          <property role="3LESm3" value="9f919b54-15e2-4ebd-9a07-b9f482bdf981" />
-          <node concept="1BupzO" id="5TezZ1Vejkl" role="3bR31x">
-            <property role="3ZfqAx" value="generator/template" />
-            <property role="1Hdu6h" value="true" />
-            <property role="1HemKv" value="true" />
-            <node concept="3LXTmp" id="5TezZ1Vejkm" role="1HemKq">
-              <node concept="398BVA" id="5TezZ1Vejk8" role="3LXTmr">
-                <ref role="398BVh" node="7he_lUurqtF" resolve="mbeddr.formal.safety.code" />
-                <node concept="2Ry0Ak" id="5TezZ1Vejk9" role="iGT6I">
-                  <property role="2Ry0Am" value="languages" />
-                  <node concept="2Ry0Ak" id="5TezZ1Vejka" role="2Ry0An">
-                    <property role="2Ry0Am" value="com.mbeddr.formal.safety.gsn.patterns" />
-                    <node concept="2Ry0Ak" id="5TezZ1Vejkb" role="2Ry0An">
-                      <property role="2Ry0Am" value="generator" />
-                      <node concept="2Ry0Ak" id="5TezZ1Vejkc" role="2Ry0An">
-                        <property role="2Ry0Am" value="template" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3qWCbU" id="5TezZ1Vejkn" role="3LXTna">
-                <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="1SiIV0" id="7he_lUur_3p" role="3bR37C">
           <node concept="3bR9La" id="7he_lUur_3q" role="1SiIV1">
             <ref role="3bR37D" node="7he_lUumK0b" resolve="com.mbeddr.formal.req.base" />
@@ -9204,35 +9175,6 @@
             <ref role="1Busuk" node="7he_lUury9o" resolve="com.mbeddr.formal.safety.gsn" />
           </node>
         </node>
-        <node concept="1yeLz9" id="7FGTN4LGKu1" role="1TViLv">
-          <property role="TrG5h" value="com.mbeddr.formal.safety.cae.generator" />
-          <property role="3LESm3" value="832c49e4-a4ce-4d15-b597-aeac59d83aff" />
-          <node concept="1BupzO" id="7FGTN4LGKuf" role="3bR31x">
-            <property role="3ZfqAx" value="generator/templates" />
-            <property role="1Hdu6h" value="true" />
-            <property role="1HemKv" value="true" />
-            <node concept="3LXTmp" id="7FGTN4LGKug" role="1HemKq">
-              <node concept="398BVA" id="7FGTN4LGKu2" role="3LXTmr">
-                <ref role="398BVh" node="7he_lUurqtF" resolve="mbeddr.formal.safety.code" />
-                <node concept="2Ry0Ak" id="7FGTN4LGKu3" role="iGT6I">
-                  <property role="2Ry0Am" value="languages" />
-                  <node concept="2Ry0Ak" id="7FGTN4LGKu4" role="2Ry0An">
-                    <property role="2Ry0Am" value="com.mbeddr.formal.safety.cae" />
-                    <node concept="2Ry0Ak" id="7FGTN4LGKu5" role="2Ry0An">
-                      <property role="2Ry0Am" value="generator" />
-                      <node concept="2Ry0Ak" id="7FGTN4LGKu6" role="2Ry0An">
-                        <property role="2Ry0Am" value="templates" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3qWCbU" id="7FGTN4LGKuh" role="3LXTna">
-                <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3rtmxn" id="39kKHgIJyHZ" role="3bR31x">
           <node concept="3LXTmp" id="39kKHgIJyI0" role="3rtmxm">
             <node concept="398BVA" id="39kKHgIJyI1" role="3LXTmr">
@@ -10505,6 +10447,11 @@
             <ref role="3bR37D" to="90a9:56Tfdun3uan" resolve="de.itemis.mps.editor.diagram.layout" />
           </node>
         </node>
+        <node concept="1SiIV0" id="_yKhEdNKm4" role="3bR37C">
+          <node concept="1Busua" id="_yKhEdNKm5" role="1SiIV1">
+            <ref role="1Busuk" node="42jqVeFkUuV" resolve="com.mbeddr.formal.base" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="3R_yAtWp53E" role="2G$12L">
         <property role="BnDLt" value="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._020_gsn_ext.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._020_gsn_ext.mps
index 1d97f1075..d55a1a749 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._020_gsn_ext.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._020_gsn_ext.mps
@@ -17,6 +17,7 @@
       </concept>
       <concept id="5879905612006349272" name="com.mbeddr.formal.safety.gsn.ext.structure.GenericNamedModelElementRefWord" flags="ng" index="lVOro">
         <property id="5879905612006349277" name="type" index="lVOrt" />
+        <reference id="5879905612006349279" name="elem" index="lVOrv" />
       </concept>
       <concept id="2392944874759792240" name="com.mbeddr.formal.safety.gsn.ext.structure.SupportedByConnectionPattern" flags="ng" index="1a4Pjv" />
       <concept id="2392944874760086914" name="com.mbeddr.formal.safety.gsn.ext.structure.IGsnConnectionPattern" flags="ng" index="1a7XsH">
@@ -47,6 +48,16 @@
         <property id="2557074442922438158" name="escapedValue" index="19SUeA" />
       </concept>
     </language>
+    <language id="17da266c-02d9-4bbd-b69b-8a656b49f45c" name="com.mbeddr.formal.safety.hara">
+      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ng" index="8gIbR">
+        <property id="3226630706269685486" name="id" index="0lsPA" />
+      </concept>
+      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ng" index="8gIbW">
+        <child id="9102875167978228305" name="hazards" index="8gIbH" />
+      </concept>
+      <concept id="9102875167978180720" name="com.mbeddr.formal.safety.hara.structure.Hazard" flags="ng" index="8gVzc" />
+      <concept id="9102875167978180681" name="com.mbeddr.formal.safety.hara.structure.HazardsList" flags="ng" index="8gVzP" />
+    </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" />
@@ -1246,7 +1257,7 @@
         <node concept="gqqVs" id="x1FXqw_vs" role="37mO4d">
           <property role="gqqTZ" value="93.0" />
           <property role="gqqTW" value="16.0" />
-          <property role="gqqTX" value="141.0" />
+          <property role="gqqTX" value="161.0" />
           <property role="gqqTy" value="97.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
@@ -1256,8 +1267,8 @@
         <node concept="gqqVs" id="x1FXqy4aJ" role="37mO4d">
           <property role="gqqTZ" value="67.0" />
           <property role="gqqTW" value="136.0" />
-          <property role="gqqTX" value="193.0" />
-          <property role="gqqTy" value="55.0" />
+          <property role="gqqTX" value="217.0" />
+          <property role="gqqTy" value="60.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -1276,17 +1287,17 @@
         <node concept="gqqVs" id="x1FXqClKN" role="37mO4d">
           <property role="gqqTZ" value="376.0" />
           <property role="gqqTW" value="15.0" />
-          <property role="gqqTX" value="205.0" />
-          <property role="gqqTy" value="55.0" />
+          <property role="gqqTX" value="222.0" />
+          <property role="gqqTy" value="60.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="56pBK14uNRk" role="37mRID">
         <property role="37mO49" value="5879905612006636982" />
         <node concept="gqqVs" id="56pBK14uNRj" role="37mO4d">
-          <property role="gqqTZ" value="380.0" />
-          <property role="gqqTW" value="137.0" />
-          <property role="gqqTX" value="204.0" />
+          <property role="gqqTZ" value="357.5" />
+          <property role="gqqTW" value="136.0" />
+          <property role="gqqTX" value="259.0" />
           <property role="gqqTy" value="55.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
@@ -1322,10 +1333,11 @@
       <property role="TrG5h" value="Hazard_Mitigated" />
       <node concept="19SGf9" id="56pBK14uNQR" role="2vnaTZ">
         <node concept="19SUe$" id="56pBK14uNQS" role="19SJt6">
-          <property role="19SUeA" value="Hazard" />
+          <property role="19SUeA" value="Hazard " />
         </node>
         <node concept="lVOro" id="56pBK14uNRA" role="19SJt6">
           <property role="lVOrt" value="hazard" />
+          <ref role="lVOrv" node="5l6J5csSGJ1" resolve="Unintended acceleration" />
         </node>
         <node concept="19SUe$" id="56pBK14uNRB" role="19SJt6">
           <property role="19SUeA" value="&#10;has been mitigated." />
@@ -1391,7 +1403,7 @@
     <property role="3GE5qa" value="config" />
   </node>
   <node concept="2vn7XN" id="2ByFloRlq4G">
-    <property role="TrG5h" value="_200_" />
+    <property role="TrG5h" value="_200_url_attribute" />
     <node concept="2vn7WC" id="2ByFloRlq4N" role="2vn1q5">
       <property role="TrG5h" value="G01_UL_4600" />
       <node concept="19SGf9" id="2ByFloRlq4O" role="2vnaTZ">
@@ -1525,9 +1537,9 @@
       <node concept="37mRIm" id="2ByFloRlq4V" role="37mRID">
         <property role="37mO49" value="3018165286098805043" />
         <node concept="gqqVs" id="2ByFloRlq4T" role="37mO4d">
-          <property role="gqqTZ" value="324.0" />
-          <property role="gqqTW" value="16.0" />
-          <property role="gqqTX" value="119.0" />
+          <property role="gqqTZ" value="171.0" />
+          <property role="gqqTW" value="33.0" />
+          <property role="gqqTX" value="128.0" />
           <property role="gqqTy" value="84.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
@@ -1537,5 +1549,12 @@
       <property role="2Wzj7u" value="3018165286098577129" />
     </node>
   </node>
+  <node concept="8gVzP" id="5l6J5csSGJ0">
+    <property role="TrG5h" value="_000_hazards_list" />
+    <node concept="8gVzc" id="5l6J5csSGJ1" role="8gIbH">
+      <property role="0lsPA" value="H01" />
+      <property role="TrG5h" value="Unintended acceleration" />
+    </node>
+  </node>
 </model>