diff --git a/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/com.fasten.symo.hw.mpl b/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/com.fasten.symo.hw.mpl
index b3f037530..bf1e13ce3 100644
--- a/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/com.fasten.symo.hw.mpl
+++ b/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/com.fasten.symo.hw.mpl
@@ -11,53 +11,10 @@
     </facet>
   </facets>
   <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="com.fasten.symo.hw#01" uuid="2905aa5f-3c50-472e-bc4a-7f980662bb27">
-      <models>
-        <modelRoot contentPath="${module}/generator" type="default">
-          <sourceRoot location="templates" />
-        </modelRoot>
-      </models>
-      <facets>
-        <facet type="java" compile="mps" classes="mps" ext="no">
-          <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="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-        <module reference="c2f3ae03-6a71-4e2a-88c9-c9e6eb4e20fa(com.fasten.symo.hw)" version="0" />
-        <module reference="2905aa5f-3c50-472e-bc4a-7f980662bb27(com.fasten.symo.hw#01)" 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">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
-    <dependency reexport="false">1144260c-e9a5-49a2-9add-39a1a1a7077e(de.itemis.mps.editor.diagram.runtime)</dependency>
+    <dependency reexport="true">1144260c-e9a5-49a2-9add-39a1a1a7077e(de.itemis.mps.editor.diagram.runtime)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="0" />
diff --git a/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/generator/templates/main@generator.mps b/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/generator/templates/main@generator.mps
deleted file mode 100644
index 7c2739844..000000000
--- a/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/generator/templates/main@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:415b1122-d6f6-4dcb-9b4c-cf02b47c182e(main@generator)">
-  <persistence version="9" />
-  <languages>
-    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
-  </languages>
-  <imports>
-    <import index="osta" ref="r:20be8470-9022-48a8-b125-64f3bb097af5(com.fasten.symo.hw.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="2gpUZARgYrg">
-    <property role="TrG5h" value="main" />
-  </node>
-</model>
-
diff --git a/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/com.symo.sysml.ibd.mpl b/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/com.symo.sysml.ibd.mpl
index 488024250..0c31a7c13 100644
--- a/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/com.symo.sysml.ibd.mpl
+++ b/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/com.symo.sysml.ibd.mpl
@@ -11,49 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="com.symo.sysml.ibd#2217399625956132788" uuid="99172f12-e309-48b0-90da-8e6426acae09">
-      <models>
-        <modelRoot contentPath="${module}/generator" type="default">
-          <sourceRoot location="templates" />
-        </modelRoot>
-      </models>
-      <facets>
-        <facet type="java" compile="mps" classes="mps" ext="no">
-          <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="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-        <module reference="d7ce0776-e180-44b6-8b3f-a274ad438311(com.symo.sysml.ibd)" version="0" />
-        <module reference="99172f12-e309-48b0-90da-8e6426acae09(com.symo.sysml.ibd#2217399625956132788)" 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">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
diff --git a/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/generator/templates/main@generator.mps b/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/generator/templates/main@generator.mps
deleted file mode 100644
index 45bfae4d9..000000000
--- a/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/generator/templates/main@generator.mps
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:d8ecbf88-6ea6-4873-87b5-7d05ccdd64c3(main@generator)">
-  <persistence version="9" />
-  <attribute name="doNotGenerate" value="false" />
-  <languages>
-    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
-  </languages>
-  <imports>
-    <import index="4hyq" ref="r:cf2fb6e4-988a-44a1-af5e-f0f6a81c5941(com.symo.sysml.ibd.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="4PDUeYRvZQI">
-    <property role="TrG5h" value="main" />
-  </node>
-</model>
-
diff --git a/code/languages/com.mbeddr.formal.cprover/solutions/com.mbeddr.formal.cbmc.rt/com.mbeddr.formal.cbmc.rt.msd b/code/languages/com.mbeddr.formal.cprover/solutions/com.mbeddr.formal.cbmc.rt/com.mbeddr.formal.cbmc.rt.msd
index 01a4b5010..5a886589b 100644
--- a/code/languages/com.mbeddr.formal.cprover/solutions/com.mbeddr.formal.cbmc.rt/com.mbeddr.formal.cbmc.rt.msd
+++ b/code/languages/com.mbeddr.formal.cprover/solutions/com.mbeddr.formal.cbmc.rt/com.mbeddr.formal.cbmc.rt.msd
@@ -12,7 +12,7 @@
   </facets>
   <sourcePath />
   <dependencies>
-    <dependency reexport="false">e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)</dependency>
+    <dependency reexport="true">e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
   </dependencies>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.tabular/models/com.mbeddr.formal.base.tabular.editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.tabular/models/com.mbeddr.formal.base.tabular.editor.mps
index c0efbd4df..6966198d3 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.tabular/models/com.mbeddr.formal.base.tabular.editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.tabular/models/com.mbeddr.formal.base.tabular.editor.mps
@@ -15,8 +15,8 @@
     <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" />
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
     <import index="oghc" ref="r:356c0504-b4a3-4458-9604-13fbb48838d7(de.slisson.mps.tables.runtime.style)" />
-    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" implicit="true" />
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="reoo" ref="r:1e59a084-7ebe-4e95-89ab-c58a7e396583(de.slisson.mps.tables.editor)" implicit="true" />
     <import index="ehqg" ref="r:2c1724e1-8ed6-4fe4-9e44-fae13cd2a5ac(com.mbeddr.formal.base.expressions.structure)" implicit="true" />
     <import index="22ra" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.update(MPS.Editor/)" implicit="true" />
@@ -240,18 +240,6 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
-    <language id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells">
-      <concept id="6856661361479784881" name="com.mbeddr.mpsutil.grammarcells.structure.InlineActionMapItem_Param_node" flags="ng" index="130tyv" />
-      <concept id="6856661361479784527" name="com.mbeddr.mpsutil.grammarcells.structure.InlineActionMapItem" flags="ng" index="130t_x">
-        <property id="1139535298778" name="actionId" index="1hAc7j" />
-        <child id="6856661361479798753" name="execute" index="130oVf" />
-      </concept>
-      <concept id="6856661361479784534" name="com.mbeddr.mpsutil.grammarcells.structure.InlineActionMapItem_ExecuteFunction" flags="ig" index="130t_S" />
-      <concept id="6856661361479732075" name="com.mbeddr.mpsutil.grammarcells.structure.InlineActionMapCell" flags="ng" index="130CD5">
-        <child id="6856661361479798957" name="actions" index="130p63" />
-        <child id="6856661361479732085" name="cell" index="130CDr" />
-      </concept>
-    </language>
     <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions">
       <concept id="767145758118872828" name="jetbrains.mps.lang.actions.structure.NF_Node_ReplaceWithNewOperation" flags="nn" index="2DeJnW" />
     </language>
@@ -370,18 +358,10 @@
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
-      <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
-        <property id="709746936026609031" name="linkId" index="3V$3ak" />
-        <property id="709746936026609029" name="role_DebugInfo" index="3V$3am" />
-      </concept>
-      <concept id="4452961908202556907" name="jetbrains.mps.lang.core.structure.BaseCommentAttribute" flags="ng" index="1X3_iC">
-        <child id="3078666699043039389" name="commentedNode" index="8Wnug" />
-      </concept>
     </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
@@ -571,75 +551,6 @@
                   </node>
                 </node>
               </node>
-              <node concept="1X3_iC" id="7Z6$Wo5NxQa" role="lGtFl">
-                <property role="3V$3am" value="statement" />
-                <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-                <node concept="3cpWs6" id="5MukRfupUR$" role="8Wnug">
-                  <node concept="2OqwBi" id="5MukRfupVmT" role="3cqZAk">
-                    <node concept="1frAZD" id="5MukRfupV7X" role="2Oq$k0" />
-                    <node concept="2CJim2" id="5MukRfupVIH" role="2OqNvi">
-                      <node concept="2CJsh3" id="5MukRfupVIJ" role="2CJshi">
-                        <node concept="130CD5" id="2vWNQYdz_SM" role="2wV5jI">
-                          <node concept="130t_x" id="2vWNQYdz_U2" role="130p63">
-                            <property role="1hAc7j" value="g_hAxAO/delete_action_id" />
-                            <node concept="130t_S" id="2vWNQYdz_U3" role="130oVf">
-                              <node concept="3clFbS" id="2vWNQYdz_U4" role="2VODD2">
-                                <node concept="3clFbF" id="7Z6$Wo5MBaH" role="3cqZAp">
-                                  <node concept="2YIFZM" id="7Z6$Wo5MBAO" role="3clFbG">
-                                    <ref role="37wK5l" node="7Z6$Wo5M$fD" resolve="removeColumn" />
-                                    <ref role="1Pybhc" node="7Z6$Wo5M$dV" resolve="TableEditorUtils_old" />
-                                    <node concept="1PxgMI" id="7Z6$Wo5Ndi0" role="37wK5m">
-                                      <node concept="chp4Y" id="7Z6$Wo5Ndj8" role="3oSUPX">
-                                        <ref role="cht4Q" to="vlrt:3JhRrgbktEe" resolve="IFunctionValueContent" />
-                                      </node>
-                                      <node concept="130tyv" id="7Z6$Wo5MBEN" role="1m5AlR" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="130t_x" id="7Z6$Wo5MCj0" role="130p63">
-                            <property role="1hAc7j" value="7P1WhNABvta/backspace_action_id" />
-                            <node concept="130t_S" id="7Z6$Wo5MCj1" role="130oVf">
-                              <node concept="3clFbS" id="7Z6$Wo5MCj2" role="2VODD2">
-                                <node concept="3clFbF" id="7Z6$Wo5MCK_" role="3cqZAp">
-                                  <node concept="2YIFZM" id="7Z6$Wo5MCKA" role="3clFbG">
-                                    <ref role="1Pybhc" node="7Z6$Wo5M$dV" resolve="TableEditorUtils_old" />
-                                    <ref role="37wK5l" node="7Z6$Wo5M$fD" resolve="removeColumn" />
-                                    <node concept="1PxgMI" id="7Z6$Wo5NdsX" role="37wK5m">
-                                      <node concept="chp4Y" id="7Z6$Wo5Ndu5" role="3oSUPX">
-                                        <ref role="cht4Q" to="vlrt:3JhRrgbktEe" resolve="IFunctionValueContent" />
-                                      </node>
-                                      <node concept="130tyv" id="7Z6$Wo5MCKB" role="1m5AlR" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3F0A7n" id="5MukRfuqRUY" role="130CDr">
-                            <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="2OqwBi" id="2CFqY3vmO5P" role="2CJshu">
-                        <node concept="2OqwBi" id="2CFqY3vmL6T" role="2Oq$k0">
-                          <node concept="37vLTw" id="2CFqY3vmKX6" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2CFqY3vmKiz" resolve="t" />
-                          </node>
-                          <node concept="3Tsc0h" id="2CFqY3vmLub" role="2OqNvi">
-                            <ref role="3TtcxE" to="vlrt:2CFqY3vlYN$" resolve="outputVariables" />
-                          </node>
-                        </node>
-                        <node concept="34jXtK" id="2CFqY3vmSz_" role="2OqNvi">
-                          <node concept="2rSBBp" id="2CFqY3vmSDz" role="25WWJ7" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
               <node concept="3cpWs8" id="1V$lRyj5woF" role="3cqZAp">
                 <node concept="3cpWsn" id="1V$lRyj5woG" role="3cpWs9">
                   <property role="TrG5h" value="n" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/plugin.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/plugin.mps
index 5ab6d87ec..d94695107 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/plugin.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/plugin.mps
@@ -7,6 +7,7 @@
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
     <use id="c9d137c4-3259-44f8-80ff-33ab2b506ee4" name="jetbrains.mps.lang.util.order" version="0" />
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
+    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tutorialActions/models/plugin.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tutorialActions/models/plugin.mps
index bbcb86104..284fbc064 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tutorialActions/models/plugin.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tutorialActions/models/plugin.mps
@@ -19,6 +19,7 @@
     <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
     <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
     <import index="2ny0" ref="86441d7a-e194-42da-81a5-2161ec62a379/java:jetbrains.mps.workbench.actions(MPS.Workbench/)" />
+    <import index="eoo2" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.nio.file(JDK/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -63,6 +64,9 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+        <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
+      </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
@@ -644,17 +648,29 @@
                 <node concept="3uibUv" id="7Y21hZBa4DY" role="1tU5fm">
                   <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
                 </node>
-                <node concept="2YIFZM" id="7Y21hZBa4DZ" role="33vP2m">
-                  <ref role="37wK5l" to="btn2:~ProjectUtil.openProject(java.lang.String,com.intellij.openapi.project.Project,boolean)" resolve="openProject" />
+                <node concept="2YIFZM" id="12q9egMY8Tk" role="33vP2m">
+                  <ref role="37wK5l" to="btn2:~ProjectUtil.openProject(java.nio.file.Path,com.intellij.ide.impl.OpenProjectTask)" resolve="openProject" />
                   <ref role="1Pybhc" to="btn2:~ProjectUtil" resolve="ProjectUtil" />
-                  <node concept="37vLTw" id="7Y21hZBa4E0" role="37wK5m">
-                    <ref role="3cqZAo" node="7Y21hZBa4DR" resolve="filePath" />
-                  </node>
-                  <node concept="37vLTw" id="7Y21hZBa4E1" role="37wK5m">
-                    <ref role="3cqZAo" node="7Y21hZBa4Dz" resolve="currentProject" />
+                  <node concept="2YIFZM" id="12q9egMYsZS" role="37wK5m">
+                    <ref role="37wK5l" to="eoo2:~Paths.get(java.lang.String,java.lang.String...)" resolve="get" />
+                    <ref role="1Pybhc" to="eoo2:~Paths" resolve="Paths" />
+                    <node concept="37vLTw" id="12q9egMYtnu" role="37wK5m">
+                      <ref role="3cqZAo" node="7Y21hZBa4DR" resolve="filePath" />
+                    </node>
                   </node>
-                  <node concept="3clFbT" id="7Y21hZBa4E2" role="37wK5m">
-                    <property role="3clFbU" value="false" />
+                  <node concept="2ShNRf" id="12q9egMYddK" role="37wK5m">
+                    <node concept="1pGfFk" id="12q9egMYkm7" role="2ShVmc">
+                      <property role="373rjd" value="true" />
+                      <ref role="37wK5l" to="btn2:~OpenProjectTask.&lt;init&gt;(boolean,com.intellij.openapi.project.Project,boolean,boolean)" resolve="OpenProjectTask" />
+                      <node concept="3clFbT" id="12q9egMYkHK" role="37wK5m">
+                        <property role="3clFbU" value="true" />
+                      </node>
+                      <node concept="10Nm6u" id="12q9egMYmdt" role="37wK5m" />
+                      <node concept="3clFbT" id="12q9egMYope" role="37wK5m">
+                        <property role="3clFbU" value="true" />
+                      </node>
+                      <node concept="3clFbT" id="12q9egMYo_t" role="37wK5m" />
+                    </node>
                   </node>
                 </node>
               </node>
diff --git a/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/com.mbeddr.formal.prism.mpl b/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/com.mbeddr.formal.prism.mpl
index 85666c86b..039487648 100644
--- a/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/com.mbeddr.formal.prism.mpl
+++ b/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/com.mbeddr.formal.prism.mpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language namespace="com.mbeddr.formal.prism" uuid="3c34ac43-22de-4ba4-9539-377c90eb9be6" languageVersion="0" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
@@ -11,57 +11,8 @@
     </facet>
   </facets>
   <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="com.mbeddr.formal.prism#01" uuid="3ad6951c-63da-4af3-82ff-281738f00a20">
-      <models>
-        <modelRoot contentPath="${module}/generator/template" type="default">
-          <sourceRoot location="." />
-        </modelRoot>
-      </models>
-      <facets>
-        <facet type="java" compile="mps" classes="mps" ext="no">
-          <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="b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)" version="0" />
-        <module reference="3c34ac43-22de-4ba4-9539-377c90eb9be6(com.mbeddr.formal.prism)" version="0" />
-        <module reference="3ad6951c-63da-4af3-82ff-281738f00a20(com.mbeddr.formal.prism#01)" 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">9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -127,6 +78,7 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
+    <extendedLanguage>9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)</extendedLanguage>
     <extendedLanguage>83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</extendedLanguage>
     <extendedLanguage>b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)</extendedLanguage>
   </extendedLanguages>
diff --git a/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/generator/template/main@generator.mps b/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/generator/template/main@generator.mps
deleted file mode 100644
index fbd1afac9..000000000
--- a/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/generator/template/main@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:f2cc5e41-a6bc-4dc3-9a52-018aea5d63e3(main@generator)">
-  <persistence version="9" />
-  <languages>
-    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
-  </languages>
-  <imports>
-    <import index="c1ru" ref="r:906fd65e-f25a-46a4-93f3-5b3ffd79b93f(com.mbeddr.formal.prism.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="ZaBFheJI0Y">
-    <property role="TrG5h" value="main" />
-  </node>
-</model>
-
diff --git a/code/languages/com.mbeddr.formal.prism/solutions/com.mbeddr.formal.prism.pluginSolution/com.mbeddr.formal.prism.pluginSolution.msd b/code/languages/com.mbeddr.formal.prism/solutions/com.mbeddr.formal.prism.pluginSolution/com.mbeddr.formal.prism.pluginSolution.msd
index 9083a4035..5e0e9e2af 100644
--- a/code/languages/com.mbeddr.formal.prism/solutions/com.mbeddr.formal.prism.pluginSolution/com.mbeddr.formal.prism.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.prism/solutions/com.mbeddr.formal.prism.pluginSolution/com.mbeddr.formal.prism.pluginSolution.msd
@@ -48,6 +48,7 @@
     <module reference="3c34ac43-22de-4ba4-9539-377c90eb9be6(com.mbeddr.formal.prism)" version="0" />
     <module reference="4e6c1b7e-ca4e-4172-8e14-215a5bd55c18(com.mbeddr.formal.prism.pluginSolution)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+    <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/code/languages/com.mbeddr.formal.prism/tests/test.com.mbeddr.formal.prism/test.com.mbeddr.formal.prism.msd b/code/languages/com.mbeddr.formal.prism/tests/test.com.mbeddr.formal.prism/test.com.mbeddr.formal.prism.msd
index 9228aa4d1..c7d6e04b0 100644
--- a/code/languages/com.mbeddr.formal.prism/tests/test.com.mbeddr.formal.prism/test.com.mbeddr.formal.prism.msd
+++ b/code/languages/com.mbeddr.formal.prism/tests/test.com.mbeddr.formal.prism/test.com.mbeddr.formal.prism.msd
@@ -16,6 +16,7 @@
     <language slang="l:b0b65429-cd22-4e2a-83e7-cd58bc6dd72f:com.mbeddr.formal.base.expressions" version="0" />
     <language slang="l:3c34ac43-22de-4ba4-9539-377c90eb9be6:com.mbeddr.formal.prism" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
     <module reference="9075688b-a848-4499-8de3-928dde5b64eb(test.com.mbeddr.formal.prism)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/com.mbeddr.formal.req.sandbox.msd b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/com.mbeddr.formal.req.sandbox.msd
index b8b18d1e4..b33d278ca 100644
--- a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/com.mbeddr.formal.req.sandbox.msd
+++ b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/com.mbeddr.formal.req.sandbox.msd
@@ -37,6 +37,7 @@
     <language slang="l:83ad0200-6e50-4939-a389-76bf899be11b:com.mbeddr.formal.req.nusmv" version="0" />
     <language slang="l:3460ac43-6f59-4f61-b134-9fa2f799c2d3:com.mbeddr.formal.req.scenarios" version="0" />
     <language slang="l:5ff577d1-1817-495b-9d6c-ff7b52c68609:com.mbeddr.formal.req.tl_patterns" version="-1" />
+    <language slang="l:0054a0d7-50ff-4b4f-beff-7e9b376d56a1:com.mbeddr.formal.req.tl_patterns.arch" version="0" />
     <language slang="l:b9f682be-3e03-4c97-ba0a-ac14cf89f12a:com.mbeddr.formal.req.tl_patterns.nusmv" version="0" />
     <language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />
     <language slang="l:8ca79d43-eb45-4791-bdd4-0d6130ff895b:de.itemis.mps.editor.diagram.layout" version="0" />
diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/models/com.mbeddr.formal.req.sandbox._040_tl_patterns_on_architecture.mps b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/models/com.mbeddr.formal.req.sandbox._040_tl_patterns_on_architecture.mps
index 623dbf814..e86102eeb 100644
--- a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/models/com.mbeddr.formal.req.sandbox._040_tl_patterns_on_architecture.mps
+++ b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/models/com.mbeddr.formal.req.sandbox._040_tl_patterns_on_architecture.mps
@@ -2,6 +2,7 @@
 <model ref="r:88239449-6f0b-4955-b529-b414205ae87b(com.mbeddr.formal.req.sandbox._040_tl_patterns_on_architecture)">
   <persistence version="9" />
   <languages>
+    <use id="0054a0d7-50ff-4b4f-beff-7e9b376d56a1" name="com.mbeddr.formal.req.tl_patterns.arch" version="0" />
     <devkit ref="b0ef168f-6f92-4bd0-82f3-cf0521463683(fasten.requirements)" />
     <devkit ref="edb51d2d-64eb-404a-818e-c1cabf1d58d5(fasten.nusmv)" />
   </languages>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.plugin.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.plugin.mps
index 8027f3747..a8397ce4c 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.plugin.mps
@@ -9,6 +9,7 @@
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
     <use id="8ca79d43-eb45-4791-bdd4-0d6130ff895b" name="de.itemis.mps.editor.diagram.layout" version="0" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
+    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/models/test.com.fasten.safety.ft._020_cutset_propagation@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/models/test.com.fasten.safety.ft._020_cutset_propagation@tests.mps
index 4aa3cfd7b..8621634b0 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/models/test.com.fasten.safety.ft._020_cutset_propagation@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/models/test.com.fasten.safety.ft._020_cutset_propagation@tests.mps
@@ -9,6 +9,7 @@
     <use id="8ca79d43-eb45-4791-bdd4-0d6130ff895b" name="de.itemis.mps.editor.diagram.layout" version="0" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
+    <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
   </languages>
   <imports>
     <import index="n7z1" ref="r:d9248eb8-cb38-4cb3-8454-cc903ebf6c86(com.fasten.safety.ft.typesystem)" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/test.com.fasten.safety.ft.msd b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/test.com.fasten.safety.ft.msd
index 2b6797b05..841fbffe5 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/test.com.fasten.safety.ft.msd
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/test.com.fasten.safety.ft.msd
@@ -52,6 +52,7 @@
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="6" />
+    <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._010_arch_models.mps b/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._010_arch_models.mps
index fcc5cff86..b05a09e55 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._010_arch_models.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._010_arch_models.mps
@@ -453,119 +453,133 @@
         </node>
       </node>
     </node>
-    <node concept="3aixLP" id="4TCu33h1aI9" role="1POhhj">
-      <node concept="21ASy4" id="4TCu33h1aHX" role="3aixLU">
-        <node concept="21ATtk" id="4TCu33h1aHY" role="3CrHoS">
+    <node concept="3aixLP" id="12q9egNOmS1" role="1POhhj">
+      <node concept="21ASy4" id="12q9egNOmRP" role="3aixLU">
+        <property role="TrG5h" value="Braking_FaultTree" />
+        <node concept="21ATtk" id="12q9egNOmRQ" role="3CrHoS">
           <property role="TrG5h" value="brakeCmd__brake force innacurate" />
         </node>
-        <node concept="21ATtL" id="4TCu33h1aI4" role="3CrHoS">
+        <node concept="21ATtL" id="12q9egNOmRW" role="3CrHoS">
           <property role="TrG5h" value="speed__speed innacurate" />
         </node>
-        <node concept="21oswF" id="4TCu33h1aI5" role="3CrHoS">
-          <ref role="21oszt" node="4TCu33h1aI4" resolve="speed__speed innacurate" />
-          <ref role="21oszj" node="4TCu33h1aI3" resolve="Or Gate 1" />
+        <node concept="21oswF" id="12q9egNOmRX" role="3CrHoS">
+          <ref role="21oszt" node="12q9egNOmRV" resolve="Or Gate 1" />
+          <ref role="21oszj" node="12q9egNOmRW" resolve="speed__speed innacurate" />
         </node>
-        <node concept="21ATtL" id="4TCu33h1aI6" role="3CrHoS">
+        <node concept="21ATtL" id="12q9egNOmRY" role="3CrHoS">
           <property role="TrG5h" value="braking algorithm malfunction" />
         </node>
-        <node concept="21oswF" id="4TCu33h1aI7" role="3CrHoS">
-          <ref role="21oszt" node="4TCu33h1aI6" resolve="braking algorithm malfunction" />
-          <ref role="21oszj" node="4TCu33h1aI3" resolve="Or Gate 1" />
+        <node concept="21oswF" id="12q9egNOmRZ" role="3CrHoS">
+          <ref role="21oszt" node="12q9egNOmRV" resolve="Or Gate 1" />
+          <ref role="21oszj" node="12q9egNOmRY" resolve="braking algorithm malfunction" />
         </node>
-        <node concept="cFNQA" id="4TCu33h1aI3" role="3CrHoS">
+        <node concept="cFNQA" id="12q9egNOmRV" role="3CrHoS">
           <property role="TrG5h" value="Or Gate 1" />
         </node>
-        <node concept="21oswF" id="4TCu33h1aI8" role="3CrHoS">
-          <ref role="21oszt" node="4TCu33h1aI3" resolve="Or Gate 1" />
-          <ref role="21oszj" node="4TCu33h1aHY" resolve="brakeCmd__brake force innacurate" />
+        <node concept="21oswF" id="12q9egNOmS0" role="3CrHoS">
+          <ref role="21oszt" node="12q9egNOmRQ" resolve="brakeCmd__brake force innacurate" />
+          <ref role="21oszj" node="12q9egNOmRV" resolve="Or Gate 1" />
         </node>
-        <node concept="37mRI7" id="4TCu33h1aK7" role="lGtFl">
-          <node concept="37mRIm" id="4TCu33h1aK8" role="37mRID">
-            <property role="37mO49" value="5649897883596794750" />
-            <node concept="gqqVs" id="4TCu33h1aK6" role="37mO4d">
-              <property role="gqqTZ" value="14.049999999999997" />
+        <node concept="37mRI7" id="12q9egNOn5h" role="lGtFl">
+          <node concept="37mRIm" id="12q9egNOn5i" role="37mRID">
+            <property role="37mO49" value="1196309213560794614" />
+            <node concept="gqqVs" id="12q9egNOn5g" role="37mO4d">
+              <property role="gqqTZ" value="77.5" />
               <property role="gqqTW" value="12.0" />
-              <property role="gqqTX" value="164.0" />
-              <property role="gqqTy" value="48.0" />
+              <property role="gqqTX" value="149.0" />
+              <property role="gqqTy" value="50.0" />
               <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
-              <node concept="1pa3jb" id="4TCu33h1aK9" role="1pap1a">
-                <property role="1pa3iD" value="source_port" />
-                <property role="2gRgW$" value="798838043" />
-              </node>
-              <node concept="1pa3jb" id="4TCu33h1aKa" role="1pap1a">
+              <node concept="1pa3jb" id="12q9egNOn5j" role="1pap1a">
                 <property role="1pa3iD" value="target_port" />
-                <property role="2gRgW$" value="1346446372" />
+                <property role="2gRgW$" value="798195494" />
+              </node>
+              <node concept="1pa3jb" id="12q9egNOn5k" role="1pap1a">
+                <property role="1pa3iD" value="source_port" />
+                <property role="2gRgW$" value="1347455734" />
               </node>
             </node>
           </node>
-          <node concept="37mRIm" id="4TCu33h1aKc" role="37mRID">
-            <property role="37mO49" value="5649897883596794756" />
-            <node concept="gqqVs" id="4TCu33h1aKb" role="37mO4d">
-              <property role="gqqTZ" value="181.0" />
-              <property role="gqqTW" value="180.0" />
-              <property role="gqqTX" value="120.0" />
-              <property role="gqqTy" value="48.0" />
+          <node concept="37mRIm" id="12q9egNOn5m" role="37mRID">
+            <property role="37mO49" value="1196309213560794620" />
+            <node concept="gqqVs" id="12q9egNOn5l" role="37mO4d">
+              <property role="gqqTZ" value="168.0" />
+              <property role="gqqTW" value="182.8" />
+              <property role="gqqTX" value="112.0" />
+              <property role="gqqTy" value="50.0" />
               <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
-              <node concept="1pa3jb" id="4TCu33h1aKd" role="1pap1a">
-                <property role="1pa3iD" value="source_port" />
-                <property role="2gRgW$" value="742818113" />
-              </node>
-              <node concept="1pa3jb" id="4TCu33h1aKe" role="1pap1a">
+              <node concept="1pa3jb" id="12q9egNOn5n" role="1pap1a">
                 <property role="1pa3iD" value="target_port" />
-                <property role="2gRgW$" value="1505174807" />
+                <property role="2gRgW$" value="634826305" />
+              </node>
+              <node concept="1pa3jb" id="12q9egNOn5o" role="1pap1a">
+                <property role="1pa3iD" value="source_port" />
+                <property role="2gRgW$" value="1506209093" />
               </node>
             </node>
           </node>
-          <node concept="37mRIm" id="4TCu33h1aKg" role="37mRID">
-            <property role="37mO49" value="5649897883596794758" />
-            <node concept="gqqVs" id="4TCu33h1aKf" role="37mO4d">
+          <node concept="37mRIm" id="12q9egNOn5q" role="37mRID">
+            <property role="37mO49" value="1196309213560794622" />
+            <node concept="gqqVs" id="12q9egNOn5p" role="37mO4d">
               <property role="gqqTZ" value="12.0" />
-              <property role="gqqTW" value="180.0" />
-              <property role="gqqTX" value="149.0" />
-              <property role="gqqTy" value="48.0" />
+              <property role="gqqTW" value="182.8" />
+              <property role="gqqTX" value="136.0" />
+              <property role="gqqTy" value="50.0" />
               <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
-              <node concept="1pa3jb" id="4TCu33h1aKh" role="1pap1a">
-                <property role="1pa3iD" value="source_port" />
-                <property role="2gRgW$" value="744508403" />
-              </node>
-              <node concept="1pa3jb" id="4TCu33h1aKi" role="1pap1a">
+              <node concept="1pa3jb" id="12q9egNOn5r" role="1pap1a">
                 <property role="1pa3iD" value="target_port" />
-                <property role="2gRgW$" value="1506865097" />
+                <property role="2gRgW$" value="636464355" />
+              </node>
+              <node concept="1pa3jb" id="12q9egNOn5s" role="1pap1a">
+                <property role="1pa3iD" value="source_port" />
+                <property role="2gRgW$" value="1507847143" />
               </node>
             </node>
           </node>
-          <node concept="37mRIm" id="4TCu33h1aKk" role="37mRID">
-            <property role="37mO49" value="5649897883596794755" />
-            <node concept="gqqVs" id="4TCu33h1aKj" role="37mO4d">
-              <property role="gqqTZ" value="66.05" />
-              <property role="gqqTW" value="80.0" />
+          <node concept="37mRIm" id="12q9egNOn5u" role="37mRID">
+            <property role="37mO49" value="1196309213560794619" />
+            <node concept="gqqVs" id="12q9egNOn5t" role="37mO4d">
+              <property role="gqqTZ" value="122.0" />
+              <property role="gqqTW" value="82.0" />
               <property role="gqqTX" value="60.0" />
               <property role="gqqTy" value="60.0" />
               <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
-              <node concept="1pa3jb" id="4TCu33h1aKl" role="1pap1a">
+              <node concept="1pa3jb" id="12q9egNOn5v" role="1pap1a">
                 <property role="1pa3iD" value="port" />
-                <property role="2gRgW$" value="1259048879" />
+                <property role="2gRgW$" value="1014859206" />
               </node>
-              <node concept="1pa3jb" id="4TCu33h1aKm" role="1pap1a">
-                <property role="1pa3iD" value="5649897883596794757" />
-                <property role="2gRgW$" value="1844411357" />
+              <node concept="1pa3jb" id="12q9egNOn5w" role="1pap1a">
+                <property role="1pa3iD" value="21" />
+                <property role="2gRgW$" value="1731148913" />
+              </node>
+              <node concept="1pa3jb" id="12q9egNOn5x" role="1pap1a">
+                <property role="1pa3iD" value="23" />
+                <property role="2gRgW$" value="1367462166" />
+              </node>
+            </node>
+          </node>
+          <node concept="37mRIm" id="12q9egNOn6s" role="37mRID">
+            <property role="37mO49" value="1196309213560794621" />
+            <node concept="2VclpC" id="12q9egNOn6r" role="37mO4d">
+              <node concept="2VclrF" id="12q9egNOn6t" role="2Vcluh">
+                <property role="2Vclpx" value="157.04999999999998" />
+                <property role="2Vclpz" value="162.0" />
               </node>
-              <node concept="1pa3jb" id="4TCu33h1aKn" role="1pap1a">
-                <property role="1pa3iD" value="5649897883596794759" />
-                <property role="2gRgW$" value="1376814111" />
+              <node concept="2VclrF" id="12q9egNOn6u" role="2Vcluh">
+                <property role="2Vclpx" value="225.0" />
+                <property role="2Vclpz" value="162.0" />
               </node>
             </node>
           </node>
-          <node concept="37mRIm" id="4TCu33h1aKp" role="37mRID">
-            <property role="37mO49" value="5649897883596794757" />
-            <node concept="2VclpC" id="4TCu33h1aKo" role="37mO4d">
-              <node concept="2VclrF" id="4TCu33h1aKq" role="2Vcluh">
-                <property role="2Vclpx" value="242.0" />
-                <property role="2Vclpz" value="160.0" />
+          <node concept="37mRIm" id="12q9egNOn6w" role="37mRID">
+            <property role="37mO49" value="1196309213560794623" />
+            <node concept="2VclpC" id="12q9egNOn6v" role="37mO4d">
+              <node concept="2VclrF" id="12q9egNOn6x" role="2Vcluh">
+                <property role="2Vclpx" value="148.95" />
+                <property role="2Vclpz" value="162.0" />
               </node>
-              <node concept="2VclrF" id="4TCu33h1aKr" role="2Vcluh">
-                <property role="2Vclpx" value="106.6" />
-                <property role="2Vclpz" value="160.0" />
+              <node concept="2VclrF" id="12q9egNOn6y" role="2Vcluh">
+                <property role="2Vclpx" value="81.0" />
+                <property role="2Vclpz" value="162.0" />
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/generator/template/spin_main@generator.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/generator/template/spin_main@generator.mps
index 59c441db3..eced67ade 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/generator/template/spin_main@generator.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/generator/template/spin_main@generator.mps
@@ -168,6 +168,10 @@
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
+      <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
+        <property id="8575328350543493365" name="message" index="huDt6" />
+        <property id="2423417345669755629" name="filter" index="1eyWvh" />
+      </concept>
     </language>
     <language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
       <concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="nn" index="3oM_SD">
@@ -264,6 +268,10 @@
     <node concept="3aamgX" id="4sMKqP$Ud6T" role="3acgRq">
       <ref role="30HIoZ" to="o3hv:4_pH3zvgMKD" resolve="LocalVarRef" />
       <node concept="1Koe21" id="4sMKqP$UhAL" role="1lVwrX">
+        <node concept="15s5l7" id="12q9egO0REQ" role="lGtFl">
+          <property role="1eyWvh" value="FLAVOUR_ISSUE_KIND=&quot;constraints (cannot be ancestor)&quot;;FLAVOUR_MESSAGE=&quot;Node '(instance of StatementsList)' cannot be ancestor of node '(instance of AssignmentStatement)'&quot;;FLAVOUR_RULE_ID=&quot;[r:5ce1e331-1070-4748-97f8-60e8b98fef9d(com.mbeddr.formal.spin.constraints)/7611646782271009668]&quot;;" />
+          <property role="huDt6" value="Node '(instance of StatementsList)' cannot be ancestor of node '(instance of AssignmentStatement)'" />
+        </node>
         <node concept="2mr7gt" id="4sMKqP$UhM3" role="1Koe22">
           <property role="TrG5h" value="pm" />
           <node concept="2mpP7Z" id="4sMKqP$UhM9" role="2mr7gi">