diff --git a/build/scripts/build_all_scripts.xml b/build/scripts/build_all_scripts.xml
index 720e35e3f..25cd349c2 100644
--- a/build/scripts/build_all_scripts.xml
+++ b/build/scripts/build_all_scripts.xml
@@ -31,6 +31,10 @@
   <property name="com.mbeddr.platform.build" value="${import.com.mbeddr.platform.com.mbeddr.platform.build}" />
   <property name="com.mbeddr.platform.mbeddr.version" value="${import.com.mbeddr.platform.com.mbeddr.platform.mbeddr.version}" />
   <property name="de.itemis.mps.extensions.versionNumber" value="${import.com.mbeddr.platform.de.itemis.mps.extensions.versionNumber}" />
+  <property name="com.mbeddr.mpsutil.actionsfilter.major.version" value="${import.com.mbeddr.platform.com.mbeddr.mpsutil.actionsfilter.major.version}" />
+  <property name="com.mbeddr.mpsutil.actionsfilter.minor.version" value="${import.com.mbeddr.platform.com.mbeddr.mpsutil.actionsfilter.minor.version}" />
+  <property name="com.mbeddr.mpsutil.actionsfilter.build" value="${import.com.mbeddr.platform.com.mbeddr.mpsutil.actionsfilter.build}" />
+  <property name="com.mbeddr.mpsutil.actionsfilter.mbeddr.version" value="${import.com.mbeddr.platform.com.mbeddr.mpsutil.actionsfilter.mbeddr.version}" />
   <property name="environment" value="env" />
   <property name="env.JAVA_HOME" value="${java.home}/.." />
   <property name="jdk.home" value="${env.JAVA_HOME}" />
@@ -103,7 +107,6 @@
         <uses>
           <language id="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" />
           <language id="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" />
-          <language id="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" />
         </uses>
         <classpath>
           <entry path="." />
@@ -130,7 +133,7 @@
       <zipfileset file="${mbeddr.formal.safety.code}/solutions/com.fasten.assurance.build/com.fasten.assurance.build.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-com.fasten.assurance.build-models" prefix="module/models" />
     </jar>
-    <echo file="${build.layout}/build.properties">mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}com.mbeddr.platform.major.version=${com.mbeddr.platform.major.version}${line.separator}com.mbeddr.platform.minor.version=${com.mbeddr.platform.minor.version}${line.separator}com.mbeddr.platform.build=${com.mbeddr.platform.build}${line.separator}com.mbeddr.platform.mbeddr.version=${com.mbeddr.platform.mbeddr.version}${line.separator}de.itemis.mps.extensions.versionNumber=${de.itemis.mps.extensions.versionNumber}</echo>
+    <echo file="${build.layout}/build.properties">mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}com.mbeddr.platform.major.version=${com.mbeddr.platform.major.version}${line.separator}com.mbeddr.platform.minor.version=${com.mbeddr.platform.minor.version}${line.separator}com.mbeddr.platform.build=${com.mbeddr.platform.build}${line.separator}com.mbeddr.platform.mbeddr.version=${com.mbeddr.platform.mbeddr.version}${line.separator}de.itemis.mps.extensions.versionNumber=${de.itemis.mps.extensions.versionNumber}${line.separator}com.mbeddr.mpsutil.actionsfilter.major.version=${com.mbeddr.mpsutil.actionsfilter.major.version}${line.separator}com.mbeddr.mpsutil.actionsfilter.minor.version=${com.mbeddr.mpsutil.actionsfilter.minor.version}${line.separator}com.mbeddr.mpsutil.actionsfilter.build=${com.mbeddr.mpsutil.actionsfilter.build}${line.separator}com.mbeddr.mpsutil.actionsfilter.mbeddr.version=${com.mbeddr.mpsutil.actionsfilter.mbeddr.version}</echo>
   </target>
   
   <target name="buildDependents" />
diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.architecture/models/com.fasten.meta.architecture.architecture.mps b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.architecture/models/com.fasten.meta.architecture.architecture.mps
index 0f7ef2c01..b18db3de2 100644
--- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.architecture/models/com.fasten.meta.architecture.architecture.mps
+++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.architecture/models/com.fasten.meta.architecture.architecture.mps
@@ -45,8 +45,359 @@
   </registry>
   <node concept="mXAGR" id="41Pak$lD7us">
     <property role="TrG5h" value="fasten_safety_architecture" />
+    <node concept="mXAGQ" id="1a4oUCoJRzU" role="mXAGU">
+      <property role="TrG5h" value="requirements_lancomp" />
+      <node concept="Z9REq" id="1a4oUCoJR_q" role="mXAiC" />
+      <node concept="mXAGQ" id="1a4oUCoJR_v" role="mXAiC">
+        <property role="TrG5h" value="requirements_base_lancomp" />
+        <node concept="mXxR0" id="1a4oUCoJR_z" role="mXAiC">
+          <property role="Z2I3b" value="req.base" />
+          <node concept="37shsh" id="1a4oUCoJR__" role="mXxR3">
+            <node concept="1dCxOk" id="1a4oUCoJRDT" role="37shsm">
+              <property role="1XweGW" value="0deccdfd-196b-4d8c-895e-0d6cb8014dfd" />
+              <property role="1XxBO9" value="com.mbeddr.formal.req.base" />
+            </node>
+          </node>
+        </node>
+        <node concept="mXxR0" id="1a4oUCoJRxk" role="mXAiC">
+          <property role="Z2I3b" value="req.ontology" />
+          <node concept="37shsh" id="1a4oUCoJRxv" role="mXxR3">
+            <node concept="1dCxOk" id="1a4oUCoJRLM" role="37shsm">
+              <property role="1XweGW" value="65ed2ac6-4499-4751-951e-3819684a4b8d" />
+              <property role="1XxBO9" value="com.fasten.req.ontology" />
+            </node>
+          </node>
+        </node>
+        <node concept="mXxR0" id="1a4oUCoJRDY" role="mXAiC">
+          <property role="Z2I3b" value="req.ontology.lib" />
+          <node concept="37shsh" id="1a4oUCoJRDZ" role="mXxR3">
+            <node concept="1dCxOk" id="1a4oUCoJRLR" role="37shsm">
+              <property role="1XweGW" value="8fe22e59-5111-4d11-87a2-2938e839b2fd" />
+              <property role="1XxBO9" value="com.fasten.req.ontology.lib" />
+            </node>
+          </node>
+        </node>
+        <node concept="mXxR0" id="1a4oUCoJREd" role="mXAiC">
+          <property role="Z2I3b" value="req.ontology.pluginSolution" />
+          <node concept="37shsh" id="1a4oUCoJREe" role="mXxR3">
+            <node concept="1dCxOk" id="1a4oUCoJRLW" role="37shsm">
+              <property role="1XweGW" value="f0ea6b3a-8982-4cc9-8499-97dda9c3bd86" />
+              <property role="1XxBO9" value="com.fasten.req.ontology.pluginSolution" />
+            </node>
+          </node>
+        </node>
+        <node concept="mXxR0" id="1a4oUCoJREs" role="mXAiC">
+          <property role="Z2I3b" value="req.tl_patterns" />
+          <node concept="37shsh" id="1a4oUCoJREt" role="mXxR3">
+            <node concept="1dCxOk" id="1a4oUCoJRNN" role="37shsm">
+              <property role="1XweGW" value="710e4a44-4764-4107-9c89-e059fb11d8f5" />
+              <property role="1XxBO9" value="test.com.mbeddr.formal.req.tl_patterns" />
+            </node>
+          </node>
+        </node>
+        <node concept="mXxR0" id="1a4oUCoJRM1" role="mXAiC">
+          <property role="Z2I3b" value="req.odd" />
+          <node concept="37shsh" id="1a4oUCoJRM2" role="mXxR3">
+            <node concept="1dCxOk" id="1a4oUCoJRR4" role="37shsm">
+              <property role="1XweGW" value="f52452b6-7f99-441b-98f9-a98c52b92236" />
+              <property role="1XxBO9" value="com.fasten.req.odd" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="mXAGQ" id="1a4oUCoJROK" role="mXAiC">
+        <property role="TrG5h" value="requirements_arch_lancomp" />
+        <node concept="mXA1B" id="1a4oUCoJRRn" role="mXAiC">
+          <node concept="mXAj4" id="1a4oUCoJRRA" role="mXvOw">
+            <ref role="mXAj7" node="1a4oUCoJR_v" resolve="requirements_base_lancomp" />
+          </node>
+        </node>
+        <node concept="mXxR0" id="1a4oUCoJRMm" role="mXAiC">
+          <property role="Z2I3b" value="req.arch" />
+          <node concept="37shsh" id="1a4oUCoJRMn" role="mXxR3">
+            <node concept="1dCxOk" id="1a4oUCoJRRC" role="37shsm">
+              <property role="1XweGW" value="24aa32c5-8513-4a94-a289-04392bead64e" />
+              <property role="1XxBO9" value="com.mbeddr.formal.req.arch" />
+            </node>
+          </node>
+        </node>
+        <node concept="mXxR0" id="1a4oUCoJRMI" role="mXAiC">
+          <property role="Z2I3b" value="req.msc" />
+          <node concept="37shsh" id="1a4oUCoJRMJ" role="mXxR3">
+            <node concept="1dCxOk" id="1a4oUCoJRRH" role="37shsm">
+              <property role="1XweGW" value="d0ca8631-0992-4239-9151-83b3064311ed" />
+              <property role="1XxBO9" value="com.mbeddr.formal.req.msc" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="Z9REq" id="1a4oUCoJREO" role="mXAGU" />
+    <node concept="mXAGQ" id="1a4oUCoJS2G" role="mXAGU">
+      <property role="TrG5h" value="safety_analyses_lancomp" />
+      <node concept="Z9REq" id="1a4oUCoJS9x" role="mXAiC" />
+      <node concept="mXAGQ" id="1a4oUCoJRK1" role="mXAiC">
+        <property role="TrG5h" value="hazards_lancomp" />
+        <node concept="mXxR0" id="1a4oUCoJRN9" role="mXAiC">
+          <property role="Z2I3b" value="hazop" />
+          <node concept="37shsh" id="1a4oUCoJRNa" role="mXxR3">
+            <node concept="1dCxOk" id="1a4oUCoJRWh" role="37shsm">
+              <property role="1XweGW" value="7af989c3-8042-42ae-bf04-8bcfa8f9dbf9" />
+              <property role="1XxBO9" value="com.fasten.safety.hazop" />
+            </node>
+          </node>
+        </node>
+        <node concept="mXxR0" id="1a4oUCoJRVo" role="mXAiC">
+          <property role="Z2I3b" value="hara" />
+          <node concept="37shsh" id="1a4oUCoJRVp" role="mXxR3">
+            <node concept="1dCxOk" id="1a4oUCoJRWr" role="37shsm">
+              <property role="1XweGW" value="17da266c-02d9-4bbd-b69b-8a656b49f45c" />
+              <property role="1XxBO9" value="com.mbeddr.formal.safety.hara" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="Z9REq" id="1a4oUCoJTSy" role="mXAiC" />
+      <node concept="mXAGQ" id="1a4oUCoJRXN" role="mXAiC">
+        <property role="TrG5h" value="stamp_lancomp" />
+        <node concept="mXA1B" id="1a4oUCoJSno" role="mXAiC">
+          <node concept="mXAj4" id="1a4oUCoJSn$" role="mXvOw">
+            <ref role="mXAj7" node="1a4oUCoJRK1" resolve="hazards_lancomp" />
+          </node>
+        </node>
+        <node concept="mXxR0" id="1a4oUCoJRVC" role="mXAiC">
+          <property role="Z2I3b" value="stamp" />
+          <node concept="37shsh" id="1a4oUCoJRVD" role="mXxR3">
+            <node concept="1dCxOk" id="1a4oUCoJRWw" role="37shsm">
+              <property role="1XweGW" value="7e777b53-0a6b-4719-b36d-10475788d49f" />
+              <property role="1XxBO9" value="com.mbeddr.formal.safety.stamp" />
+            </node>
+          </node>
+        </node>
+        <node concept="mXxR0" id="1a4oUCoJRVS" role="mXAiC">
+          <property role="Z2I3b" value="stamp.ext" />
+          <node concept="37shsh" id="1a4oUCoJRVT" role="mXxR3">
+            <node concept="1dCxOk" id="1a4oUCoJRW_" role="37shsm">
+              <property role="1XweGW" value="eccaed1c-88f4-4a5c-9ad8-d1b8c9f330e9" />
+              <property role="1XxBO9" value="com.mbeddr.formal.safety.stamp.ext" />
+            </node>
+          </node>
+        </node>
+        <node concept="mXxR0" id="1a4oUCoJRWE" role="mXAiC">
+          <property role="Z2I3b" value="stamp.pluginSolution" />
+          <node concept="37shsh" id="1a4oUCoJRWF" role="mXxR3">
+            <node concept="1dCxOk" id="1a4oUCoJRX3" role="37shsm">
+              <property role="1XweGW" value="29225a93-74b7-4dc0-b3c5-36b7e42fa0f0" />
+              <property role="1XxBO9" value="com.mbeddr.formal.safety.stamp.pluginSolution" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="Z9REq" id="1a4oUCoJS9z" role="mXAiC" />
+      <node concept="mXAGQ" id="1a4oUCoJRs3" role="mXAiC">
+        <property role="TrG5h" value="fault_trees_lancomp" />
+        <node concept="mXAGQ" id="1a4oUCoJRuU" role="mXAiC">
+          <property role="TrG5h" value="fault_trees_base_lancomp" />
+          <node concept="mXxR0" id="1a4oUCoJRti" role="mXAiC">
+            <property role="Z2I3b" value="ft" />
+            <node concept="37shsh" id="1a4oUCoJRtm" role="mXxR3">
+              <node concept="1dCxOk" id="1a4oUCoJRtt" role="37shsm">
+                <property role="1XweGW" value="ab274f70-5238-4883-adc7-02df7a757829" />
+                <property role="1XxBO9" value="com.fasten.safety.ft" />
+              </node>
+            </node>
+          </node>
+          <node concept="mXxR0" id="1a4oUCoJRtC" role="mXAiC">
+            <property role="Z2I3b" value="ft.pluginSolution" />
+            <node concept="37shsh" id="1a4oUCoJRtD" role="mXxR3">
+              <node concept="1dCxOk" id="1a4oUCoJRur" role="37shsm">
+                <property role="1XweGW" value="4dc47fba-0f4f-4162-820b-d2e1e306482d" />
+                <property role="1XxBO9" value="com.fasten.safety.ft.pluginSolution" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="mXAGQ" id="1a4oUCoJRvA" role="mXAiC">
+          <property role="TrG5h" value="fault_trees_xfta_lancomp" />
+          <node concept="mXA1B" id="1a4oUCoJRwH" role="mXAiC">
+            <node concept="mXAj4" id="1a4oUCoJRwQ" role="mXvOw">
+              <ref role="mXAj7" node="1a4oUCoJRuU" resolve="fault_trees_base_lancomp" />
+            </node>
+          </node>
+          <node concept="mXxR0" id="1a4oUCoJRtQ" role="mXAiC">
+            <property role="Z2I3b" value="xfta" />
+            <node concept="37shsh" id="1a4oUCoJRtR" role="mXxR3">
+              <node concept="1dCxOk" id="1a4oUCoJRuw" role="37shsm">
+                <property role="1XweGW" value="82b16819-a621-494e-8797-872ebe7f4433" />
+                <property role="1XxBO9" value="test.com.fasten.safety.ft.xfta" />
+              </node>
+            </node>
+          </node>
+          <node concept="mXxR0" id="1a4oUCoJRu7" role="mXAiC">
+            <property role="Z2I3b" value="ft.xfta_gen" />
+            <node concept="37shsh" id="1a4oUCoJRu8" role="mXxR3">
+              <node concept="1dCxOk" id="1a4oUCoJRu_" role="37shsm">
+                <property role="1XweGW" value="091b20ea-7bf0-41d6-8e6e-4460a9bd8121" />
+                <property role="1XxBO9" value="com.fasten.safety.ft.xfta_gen" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="Z9REq" id="1a4oUCoJSzz" role="mXAiC" />
+      <node concept="mXAGQ" id="1a4oUCoJSxo" role="mXAiC">
+        <property role="TrG5h" value="fmea_lancomp" />
+        <node concept="mXxR0" id="1a4oUCoJSxq" role="mXAiC">
+          <property role="Z2I3b" value="fmea" />
+          <node concept="37shsh" id="1a4oUCoJSxr" role="mXxR3">
+            <node concept="1dCxOk" id="1a4oUCoJSzi" role="37shsm">
+              <property role="1XweGW" value="b43c548b-f75f-46e2-ad24-de9edd93e95e" />
+              <property role="1XxBO9" value="com.fasten.safety.fmea" />
+            </node>
+          </node>
+        </node>
+        <node concept="mXxR0" id="1a4oUCoO858" role="mXAiC">
+          <property role="Z2I3b" value="fmea.arch" />
+          <node concept="37shsh" id="1a4oUCoO85h" role="mXxR3">
+            <node concept="1dCxOk" id="1a4oUCoO85o" role="37shsm">
+              <property role="1XweGW" value="1110e3ef-a98e-444f-9748-1d61fe61c7f7" />
+              <property role="1XxBO9" value="com.fasten.safety.fmea.arch" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="Z9REq" id="1a4oUCoKiBu" role="mXAiC" />
+      <node concept="mXAGQ" id="1a4oUCoKiAa" role="mXAiC">
+        <property role="TrG5h" value="bayesian_lancomp" />
+        <node concept="mXxR0" id="1a4oUCoKiAc" role="mXAiC">
+          <property role="Z2I3b" value="bayesian_network" />
+          <node concept="37shsh" id="1a4oUCoKiAd" role="mXxR3">
+            <node concept="1dCxOk" id="1a4oUCoKiCQ" role="37shsm">
+              <property role="1XweGW" value="14289527-ae82-48f0-ab60-380cec6ac506" />
+              <property role="1XxBO9" value="com.fasten.safety.bayesian_network" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="Z9REq" id="1a4oUCoJSEB" role="mXAiC" />
+      <node concept="mXAGQ" id="1a4oUCoJRZ5" role="mXAiC">
+        <property role="TrG5h" value="fault_trees_hiphops_lancomp" />
+        <node concept="mXA1B" id="1a4oUCoJRZ6" role="mXAiC">
+          <node concept="mXAj4" id="1a4oUCoJRZ7" role="mXvOw">
+            <ref role="mXAj7" node="1a4oUCoJRuU" resolve="fault_trees_base_lancomp" />
+          </node>
+          <node concept="mXAj4" id="1a4oUCoJSFA" role="mXvOw">
+            <ref role="mXAj7" node="1a4oUCoJSxo" resolve="fmea_lancomp" />
+          </node>
+        </node>
+        <node concept="mXxR0" id="1a4oUCoJRZ8" role="mXAiC">
+          <property role="Z2I3b" value="safety.hiphops" />
+          <node concept="37shsh" id="1a4oUCoJRZ9" role="mXxR3">
+            <node concept="1dCxOk" id="1a4oUCoJRZJ" role="37shsm">
+              <property role="1XweGW" value="c6d7e8a3-3d80-479a-8799-a11fe1902b1c" />
+              <property role="1XxBO9" value="com.fasten.safety.hiphops" />
+            </node>
+          </node>
+        </node>
+        <node concept="mXxR0" id="1a4oUCoJRZb" role="mXAiC">
+          <property role="Z2I3b" value="safety.hiphops.arch" />
+          <node concept="37shsh" id="1a4oUCoJRZc" role="mXxR3">
+            <node concept="1dCxOk" id="1a4oUCoJRZO" role="37shsm">
+              <property role="1XweGW" value="521724dc-29ef-4d5a-9c15-25f6b680b809" />
+              <property role="1XxBO9" value="com.fasten.safety.hiphops.arch" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="Z9REq" id="1a4oUCoO85z" role="mXAiC" />
+      <node concept="mXAGQ" id="1a4oUCoO87I" role="mXAiC">
+        <property role="TrG5h" value="safety_analyses_iso26262_lancomp" />
+        <node concept="mXA1B" id="1a4oUCoO8a0" role="mXAiC">
+          <node concept="mXAj4" id="1a4oUCoO8ac" role="mXvOw">
+            <ref role="mXAj7" node="1a4oUCoJRK1" resolve="hazards_lancomp" />
+          </node>
+          <node concept="mXAj4" id="1a4oUCoO8ae" role="mXvOw">
+            <ref role="mXAj7" node="1a4oUCoJSxo" resolve="fmea_lancomp" />
+          </node>
+        </node>
+        <node concept="mXxR0" id="1a4oUCoO890" role="mXAiC">
+          <property role="Z2I3b" value="safety.iso26262" />
+          <node concept="37shsh" id="1a4oUCoO896" role="mXxR3">
+            <node concept="1dCxOk" id="1a4oUCoO89d" role="37shsm">
+              <property role="1XweGW" value="a798113f-e2cd-4e21-a8e2-ca1903cb9c43" />
+              <property role="1XxBO9" value="com.mbeddr.formal.safety.iso26262" />
+            </node>
+          </node>
+        </node>
+        <node concept="mXxR0" id="1a4oUCoJRVb" role="mXAiC">
+          <property role="Z2I3b" value="hazop.iso26262" />
+          <node concept="37shsh" id="1a4oUCoJRVc" role="mXxR3">
+            <node concept="1dCxOk" id="1a4oUCoJRWm" role="37shsm">
+              <property role="1XweGW" value="f610e51f-b05d-4ea8-a354-7ee51a81bcbc" />
+              <property role="1XxBO9" value="com.fasten.safety.hazop.iso26262" />
+            </node>
+          </node>
+        </node>
+        <node concept="mXxR0" id="1a4oUCoO89q" role="mXAiC">
+          <property role="Z2I3b" value="fmea.iso26262" />
+          <node concept="37shsh" id="1a4oUCoO89z" role="mXxR3">
+            <node concept="1dCxOk" id="1a4oUCoO89E" role="37shsm">
+              <property role="1XweGW" value="dc773f77-cced-42c8-ba62-465140b810a5" />
+              <property role="1XxBO9" value="com.fasten.safety.fmea.iso26262" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="Z9REq" id="1a4oUCoJRIh" role="mXAGU" />
+    <node concept="mXAGQ" id="1a4oUCoJTQk" role="mXAGU">
+      <property role="TrG5h" value="requirements_safety_lancomp" />
+      <node concept="mXA1B" id="1a4oUCoJTQP" role="mXAiC">
+        <node concept="mXAj4" id="1a4oUCoJTQV" role="mXvOw">
+          <ref role="mXAj7" node="1a4oUCoJR_v" resolve="requirements_base_lancomp" />
+        </node>
+        <node concept="mXAj4" id="1a4oUCoJTTE" role="mXvOw">
+          <ref role="mXAj7" node="1a4oUCoJRK1" resolve="hazards_lancomp" />
+        </node>
+        <node concept="mXAj4" id="1a4oUCoKitu" role="mXvOw">
+          <ref role="mXAj7" node="1a4oUCoJRXN" resolve="stamp_lancomp" />
+        </node>
+      </node>
+      <node concept="mXxR0" id="1a4oUCoJTQy" role="mXAiC">
+        <property role="Z2I3b" value="safety.req" />
+        <node concept="37shsh" id="1a4oUCoJTQ$" role="mXxR3">
+          <node concept="1dCxOk" id="1a4oUCoJTQF" role="37shsm">
+            <property role="1XweGW" value="434b2bfb-bd7a-47c9-bced-b445035e6d96" />
+            <property role="1XxBO9" value="com.mbeddr.formal.safety.req" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="Z9REq" id="1a4oUCoKivQ" role="mXAGU" />
+    <node concept="mXAGQ" id="1a4oUCoJSrH" role="mXAGU">
+      <property role="TrG5h" value="safety_process_lancomp" />
+      <node concept="mXxR0" id="1a4oUCoJSuh" role="mXAiC">
+        <property role="Z2I3b" value="process.review" />
+        <node concept="37shsh" id="1a4oUCoJSul" role="mXxR3">
+          <node concept="1dCxOk" id="1a4oUCoJSvc" role="37shsm">
+            <property role="1XweGW" value="6d475058-7ea2-490d-87e7-0f7f46dccc66" />
+            <property role="1XxBO9" value="com.fasten.process.review" />
+          </node>
+        </node>
+      </node>
+      <node concept="mXxR0" id="1a4oUCoJSus" role="mXAiC">
+        <property role="Z2I3b" value="process.review.generator" />
+        <node concept="37shsh" id="1a4oUCoJSut" role="mXxR3">
+          <node concept="1dCxOk" id="1a4oUCoJSvh" role="37shsm">
+            <property role="1XweGW" value="422f456d-00c1-43e1-afde-92df55d9ffca" />
+            <property role="1XxBO9" value="com.fasten.process.review.generator" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="Z9REq" id="1a4oUCoJRqU" role="mXAGU" />
     <node concept="mXAGQ" id="41Pak$lD7uD" role="mXAGU">
-      <property role="TrG5h" value="assurance" />
+      <property role="TrG5h" value="assurance_lancomp" />
       <node concept="mXAGQ" id="41Pak$lHijS" role="mXAiC">
         <property role="TrG5h" value="assurance_base_lancomp" />
         <node concept="Z9REq" id="41Pak$lH_k4" role="mXAiC" />
@@ -79,7 +430,6 @@
               </node>
             </node>
           </node>
-          <node concept="Z9REq" id="41Pak$lHH$7" role="mXAiC" />
           <node concept="mXxR0" id="41Pak$lHHzy" role="mXAiC">
             <property role="Z2I3b" value="gsn.pluginSolution" />
             <node concept="37shsh" id="41Pak$lHHzJ" role="mXxR3">
@@ -90,6 +440,33 @@
             </node>
           </node>
         </node>
+        <node concept="Z9REq" id="1a4oUCoO83h" role="mXAiC" />
+        <node concept="mXAGQ" id="1a4oUCoO81$" role="mXAiC">
+          <property role="TrG5h" value="assurance_base_gsn_web_lancomp" />
+          <node concept="mXA1B" id="1a4oUCoO84P" role="mXAiC">
+            <node concept="mXAj4" id="1a4oUCoO84Y" role="mXvOw">
+              <ref role="mXAj7" node="41Pak$lH_kn" resolve="assurance_base_gsn_lancomp" />
+            </node>
+          </node>
+          <node concept="mXxR0" id="1a4oUCoO81L" role="mXAiC">
+            <property role="Z2I3b" value="gsn.web" />
+            <node concept="37shsh" id="1a4oUCoO81M" role="mXxR3">
+              <node concept="1dCxOk" id="1a4oUCoO81N" role="37shsm">
+                <property role="1XweGW" value="0ca42a58-5150-4a55-89be-ba447ef72356" />
+                <property role="1XxBO9" value="com.mbeddr.formal.safety.gsn.web" />
+              </node>
+            </node>
+          </node>
+          <node concept="mXxR0" id="1a4oUCoO81O" role="mXAiC">
+            <property role="Z2I3b" value="gsn.web.rt" />
+            <node concept="37shsh" id="1a4oUCoO81P" role="mXxR3">
+              <node concept="1dCxOk" id="1a4oUCoO81Q" role="37shsm">
+                <property role="1XweGW" value="f762e964-9110-40bd-ac0a-9fbf8a051755" />
+                <property role="1XxBO9" value="com.mbeddr.formal.safety.gsn.web.rt" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="Z9REq" id="41Pak$lH_mM" role="mXAiC" />
         <node concept="mXAGQ" id="41Pak$lH_l2" role="mXAiC">
           <property role="TrG5h" value="assurance_base_cae_lancomp" />
@@ -179,7 +556,6 @@
               </node>
             </node>
           </node>
-          <node concept="Z9REq" id="41Pak$lHHAN" role="mXAiC" />
         </node>
       </node>
       <node concept="Z9REq" id="41Pak$lH_vy" role="mXAiC" />
@@ -227,8 +603,120 @@
           </node>
         </node>
       </node>
+      <node concept="Z9REq" id="1a4oUCoJSH6" role="mXAiC" />
+      <node concept="mXAGQ" id="1a4oUCoJSFD" role="mXAiC">
+        <property role="TrG5h" value="assurance_runtime_lancomp" />
+        <node concept="mXA1B" id="1a4oUCoJSFE" role="mXAiC">
+          <node concept="mXAj4" id="1a4oUCoJSFF" role="mXvOw">
+            <ref role="mXAj7" node="41Pak$lH_kn" resolve="assurance_base_gsn_lancomp" />
+          </node>
+        </node>
+        <node concept="mXxR0" id="1a4oUCoJSFG" role="mXAiC">
+          <property role="Z2I3b" value="safety.argument.runtime" />
+          <node concept="37shsh" id="1a4oUCoJSFH" role="mXxR3">
+            <node concept="1dCxOk" id="1a4oUCoJSJk" role="37shsm">
+              <property role="1XweGW" value="546ac349-3106-438d-b92b-7d2ebfa2ade8" />
+              <property role="1XxBO9" value="com.mbeddr.formal.safety.argument.runtime" />
+            </node>
+          </node>
+        </node>
+        <node concept="mXxR0" id="1a4oUCoJSIx" role="mXAiC">
+          <property role="Z2I3b" value="safety.argument.runtime.pluginSolution" />
+          <node concept="37shsh" id="1a4oUCoJSIy" role="mXxR3">
+            <node concept="1dCxOk" id="1a4oUCoJSJp" role="37shsm">
+              <property role="1XweGW" value="81f324e1-38b1-44b1-85d2-19432dece3f6" />
+              <property role="1XxBO9" value="com.mbeddr.formal.safety.argument.runtime.pluginSolution" />
+            </node>
+          </node>
+        </node>
+        <node concept="mXxR0" id="1a4oUCoJSIG" role="mXAiC">
+          <property role="Z2I3b" value="argument.spi" />
+          <node concept="37shsh" id="1a4oUCoJSIH" role="mXxR3">
+            <node concept="1dCxOk" id="1a4oUCoJSJu" role="37shsm">
+              <property role="1XweGW" value="1118d03f-f774-4a18-9e75-2357f8563d46" />
+              <property role="1XxBO9" value="com.mbeddr.formal.safety.argument.spi" />
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="Z9REq" id="41Pak$lHHBg" role="mXAiC" />
-      <node concept="Z9REq" id="41Pak$lHHCe" role="mXAiC" />
+      <node concept="mXAGQ" id="1a4oUCoJSvB" role="mXAiC">
+        <property role="TrG5h" value="assurance_process" />
+        <node concept="mXA1B" id="1a4oUCoJSx1" role="mXAiC">
+          <node concept="mXAj4" id="1a4oUCoJSxb" role="mXvOw">
+            <ref role="mXAj7" node="1a4oUCoJSrH" resolve="safety_process_lancomp" />
+          </node>
+          <node concept="mXAj4" id="1a4oUCoJSxl" role="mXvOw">
+            <ref role="mXAj7" node="41Pak$lH_kn" resolve="assurance_base_gsn_lancomp" />
+          </node>
+        </node>
+        <node concept="mXxR0" id="1a4oUCoJSuA" role="mXAiC">
+          <property role="Z2I3b" value="safety.argument.process" />
+          <node concept="37shsh" id="1a4oUCoJSuB" role="mXxR3">
+            <node concept="1dCxOk" id="1a4oUCoJSvm" role="37shsm">
+              <property role="1XweGW" value="8a4ef392-f4b4-43e7-afb5-b071dce8043d" />
+              <property role="1XxBO9" value="com.mbeddr.formal.safety.argument.process" />
+            </node>
+          </node>
+        </node>
+        <node concept="mXxR0" id="1a4oUCoJSuT" role="mXAiC">
+          <property role="Z2I3b" value="safety.argument.process.artifacts" />
+          <node concept="37shsh" id="1a4oUCoJSuU" role="mXxR3">
+            <node concept="1dCxOk" id="1a4oUCoJSvr" role="37shsm">
+              <property role="1XweGW" value="fdecb1e5-875e-41ef-a5fd-4b18f747f204" />
+              <property role="1XxBO9" value="com.mbeddr.formal.safety.argument.process.artefacts" />
+            </node>
+          </node>
+        </node>
+        <node concept="mXxR0" id="1a4oUCoKl0E" role="mXAiC">
+          <property role="Z2I3b" value="argument.jira_integration" />
+          <node concept="37shsh" id="1a4oUCoKl0Q" role="mXxR3">
+            <node concept="1dCxOk" id="1a4oUCoKl0X" role="37shsm">
+              <property role="1XweGW" value="e6e482a5-282a-4c6d-862a-311affd0586b" />
+              <property role="1XxBO9" value="com.mbeddr.formal.safety.argument.jira_integration" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="Z9REq" id="1a4oUCoKl2_" role="mXAGU" />
+    <node concept="mXAGQ" id="1a4oUCoKl9e" role="mXAGU">
+      <property role="TrG5h" value="checkable_assurance_patterns_lancomp" />
+      <node concept="mXA1B" id="1a4oUCoKlcA" role="mXAiC">
+        <node concept="mXAj4" id="1a4oUCoNl58" role="mXvOw">
+          <ref role="mXAj7" node="1a4oUCoJRzU" resolve="requirements_lancomp" />
+        </node>
+        <node concept="mXAj4" id="1a4oUCoNl7A" role="mXvOw">
+          <ref role="mXAj7" node="1a4oUCoJTQk" resolve="requirements_safety_lancomp" />
+        </node>
+        <node concept="mXAj4" id="1a4oUCoNl7F" role="mXvOw">
+          <ref role="mXAj7" node="1a4oUCoJSrH" resolve="safety_process_lancomp" />
+        </node>
+        <node concept="mXAj4" id="1a4oUCoNl55" role="mXvOw">
+          <ref role="mXAj7" node="1a4oUCoJS2G" resolve="safety_analyses_lancomp" />
+        </node>
+        <node concept="mXAj4" id="1a4oUCoKlcM" role="mXvOw">
+          <ref role="mXAj7" node="41Pak$lD7uD" resolve="assurance_lancomp" />
+        </node>
+      </node>
+      <node concept="mXxR0" id="1a4oUCoKl12" role="mXAiC">
+        <property role="Z2I3b" value="gsn.patterns" />
+        <node concept="37shsh" id="1a4oUCoKl1h" role="mXxR3">
+          <node concept="1dCxOk" id="1a4oUCoKl1o" role="37shsm">
+            <property role="1XweGW" value="f465db4c-63d4-40ef-afda-acd713dc19a1" />
+            <property role="1XxBO9" value="com.mbeddr.formal.safety.gsn.patterns" />
+          </node>
+        </node>
+      </node>
+      <node concept="mXxR0" id="1a4oUCoKl1I" role="mXAiC">
+        <property role="Z2I3b" value="gsn.patterns.lib" />
+        <node concept="37shsh" id="1a4oUCoKl1J" role="mXxR3">
+          <node concept="1dCxOk" id="1a4oUCoKl27" role="37shsm">
+            <property role="1XweGW" value="676b5323-9c6d-4b8d-a4fc-5d159c3d8aed" />
+            <property role="1XxBO9" value="com.mbeddr.formal.safety.gsn.patterns.lib" />
+          </node>
+        </node>
+      </node>
     </node>
   </node>
 </model>
diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/com.fasten.meta.linters.msd b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/com.fasten.meta.linters.msd
index 2dd513c1f..84725e6ac 100644
--- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/com.fasten.meta.linters.msd
+++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/com.fasten.meta.linters.msd
@@ -26,6 +26,9 @@
     <language slang="l:40ab19e9-751a-4433-b645-0e65160e58a0:org.mpsqa.lint.generic" version="1" />
   </languageVersions>
   <dependencyVersions>
+    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="97efeb54-e757-4c3b-b175-aa20f7476a23(com.fasten.meta.linters)" version="0" />
     <module reference="a86f8e91-0c59-4691-a7ce-49b7e2c7c3a9(org.mpsqa.lint.generic.linters_library)" version="0" />
     <module reference="12a40499-ed72-4b23-9437-358c4217c97b(org.mpsqa.lint.mps_lang.linters_library)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.filesystem_level.mps b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.filesystem_level.mps
index 92ecbef6b..f80933191 100644
--- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.filesystem_level.mps
+++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.filesystem_level.mps
@@ -9,7 +9,7 @@
   </languages>
   <imports>
     <import index="54p5" ref="r:3e5efb66-1a16-46d1-89d2-26142a5dcdaa(org.mpsqa.lint.generic.linters_library.meta)" />
-    <import index="mjm5" ref="r:1cfdc492-ba5c-44bc-987a-7d4e55b9c1ad(org.mpsqa.lint.generic.linters_library.nodes)" implicit="true" />
+    <import index="mjm5" ref="r:1cfdc492-ba5c-44bc-987a-7d4e55b9c1ad(org.mpsqa.lint.generic.linters_library.nodes)" />
   </imports>
   <registry>
     <language id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic">
diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.module_level.mps b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.module_level.mps
index 86ca10f09..42f8055f0 100644
--- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.module_level.mps
+++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.module_level.mps
@@ -28,6 +28,16 @@
       <concept id="3786325089106496663" name="org.mpsqa.lint.generic.structure.ReuseCheckableScript" flags="ng" index="2wR3oc">
         <reference id="3786325089106496690" name="script" index="2wR3oD" />
       </concept>
+      <concept id="7223240310078271419" name="org.mpsqa.lint.generic.structure.ILinterResultsContainer" flags="ngI" index="3dgnlL">
+        <property id="7223240310078527797" name="failOnlyOnNewResults" index="3dJkfZ" />
+        <child id="7223240310078271420" name="violations" index="3dgnlQ" />
+      </concept>
+      <concept id="7223240310078271416" name="org.mpsqa.lint.generic.structure.ResultEntry" flags="ng" index="3dgnlM">
+        <property id="49142249442884896" name="resultLocation" index="2hbMIX" />
+        <property id="7223240310078271417" name="result" index="3dgnlN" />
+        <property id="8230153551040655111" name="resultNodeModelId" index="3qxsSb" />
+        <property id="8230153551040654991" name="resultNodeId" index="3qxsY3" />
+      </concept>
     </language>
     <language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
       <concept id="4733039728785194814" name="jetbrains.mps.lang.modelapi.structure.NamedNodeReference" flags="ng" index="ZC_QK">
@@ -47,7 +57,14 @@
     <ref role="2wR3oD" to="wpu7:1anGYsMsnkr" resolve="broken_module_dependencies" />
   </node>
   <node concept="2wR3oc" id="6wRVFFwyqlK">
+    <property role="3dJkfZ" value="true" />
     <ref role="2wR3oD" to="wpu7:7hx0FZiTgg2" resolve="not_used_module_dependencies" />
+    <node concept="3dgnlM" id="1a4oUCpPFZh" role="3dgnlQ">
+      <property role="3dgnlN" value="The module has unused dependencies: com.mbeddr.formal.nusmv.cbd#01" />
+      <property role="3qxsY3" value="7509733390062036336" />
+      <property role="3qxsSb" value="r:54059a0b-024a-42ab-b8cd-2453fed4f7ff(com.fasten.meta.linters.module_level)" />
+      <property role="2hbMIX" value="0cd4968b-4ddc-4835-aa0f-2a9e87b43fae(com.mbeddr.formal.safety.gsn.odd#01)" />
+    </node>
   </node>
   <node concept="2wR3oc" id="6wRVFFwyqlL">
     <ref role="2wR3oD" to="wpu7:3$9W3co2Xpl" resolve="modules_in_project_directory_on_harddisk_but_not_added_to_project" />
diff --git a/code/languages/com.mbeddr.formal.safety/.mps/modules.xml b/code/languages/com.mbeddr.formal.safety/.mps/modules.xml
index 7cee74d19..a64fc49f2 100644
--- a/code/languages/com.mbeddr.formal.safety/.mps/modules.xml
+++ b/code/languages/com.mbeddr.formal.safety/.mps/modules.xml
@@ -63,6 +63,7 @@
       <modulePath path="$PROJECT_DIR$/solutions/com.fasten.safety.ft.pluginSolution/com.fasten.safety.ft.pluginSolution.msd" folder="ft" />
       <modulePath path="$PROJECT_DIR$/solutions/com.fasten.safety.ft.sandbox/com.fasten.safety.ft.sandbox.msd" folder="ft" />
       <modulePath path="$PROJECT_DIR$/solutions/com.fasten.safety.ft.xfta.pluginSolution/com.fasten.safety.ft.xfta.pluginSolution.msd" folder="ft" />
+      <modulePath path="$PROJECT_DIR$/solutions/com.fasten.safety.ft.xfta.sandbox/com.fasten.safety.ft.xfta.sandbox.msd" folder="ft" />
       <modulePath path="$PROJECT_DIR$/solutions/com.fasten.safety.hara.sandbox/com.fasten.safety.hara.sandbox.msd" folder="hara" />
       <modulePath path="$PROJECT_DIR$/solutions/com.fasten.safety.hazop.sandbox/com.fasten.safety.hazop.sandbox.msd" folder="hara.hazop" />
       <modulePath path="$PROJECT_DIR$/solutions/com.fasten.safety.hiphops.sandbox/com.fasten.safety.hiphops.sandbox.msd" folder="fmea_hiphops" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/com.fasten.process.review.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/com.fasten.process.review.mpl
index f622f4ad4..be42de2e3 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/com.fasten.process.review.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/com.fasten.process.review.mpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language namespace="com.fasten.process.review" uuid="6d475058-7ea2-490d-87e7-0f7f46dccc66" languageVersion="0" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
@@ -11,51 +11,7 @@
     </facet>
   </facets>
   <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="com.fasten.process.review.generator" uuid="422f456d-00c1-43e1-afde-92df55d9ffca">
-      <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="2" />
-        <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="6d475058-7ea2-490d-87e7-0f7f46dccc66(com.fasten.process.review)" version="0" />
-        <module reference="422f456d-00c1-43e1-afde-92df55d9ffca(com.fasten.process.review.generator)" version="0" />
-        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-      </dependencyVersions>
-      <mapping-priorities />
-    </generator>
-  </generators>
   <dependencies>
-    <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>
   </dependencies>
@@ -119,6 +75,8 @@
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" 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.process.review/generator/templates/com.fasten.process.review.generator.templates@generator.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/generator/templates/com.fasten.process.review.generator.templates@generator.mps
deleted file mode 100644
index 2d8cdb798..000000000
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/generator/templates/com.fasten.process.review.generator.templates@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:13ac9ad4-b2b5-4737-aa2a-23908bb7bd55(com.fasten.process.review.generator.templates@generator)">
-  <persistence version="9" />
-  <languages>
-    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
-  </languages>
-  <imports>
-    <import index="kivz" ref="r:dd766917-4a5c-40cc-9eef-1d695686872d(com.fasten.process.review.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="ngI" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="bUwia" id="5t37uj6_C84">
-    <property role="TrG5h" value="main" />
-  </node>
-</model>
-
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/com.fasten.safety.bayesian_network.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/com.fasten.safety.bayesian_network.mpl
index 62b4fe3ed..93fed6e88 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/com.fasten.safety.bayesian_network.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/com.fasten.safety.bayesian_network.mpl
@@ -11,53 +11,9 @@
     </facet>
   </facets>
   <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="com.fasten.safety.bayesian_network.generator" uuid="d6928dde-248a-483c-8a2c-af50f6c5e322">
-      <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="2" />
-        <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="14289527-ae82-48f0-ab60-380cec6ac506(com.fasten.safety.bayesian_network)" version="0" />
-        <module reference="d6928dde-248a-483c-8a2c-af50f6c5e322(com.fasten.safety.bayesian_network.generator)" version="0" />
-        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-      </dependencyVersions>
-      <mapping-priorities />
-    </generator>
-  </generators>
   <dependencies>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-    <dependency reexport="false">b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
   </dependencies>
   <languageVersions>
@@ -106,7 +62,6 @@
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="14289527-ae82-48f0-ab60-380cec6ac506(com.fasten.safety.bayesian_network)" 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="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
   </dependencyVersions>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/generator/templates/com.fasten.safety.bayesian_network.generator.templates@generator.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/generator/templates/com.fasten.safety.bayesian_network.generator.templates@generator.mps
deleted file mode 100644
index a39b93b42..000000000
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/generator/templates/com.fasten.safety.bayesian_network.generator.templates@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:dddb65f0-0009-40e1-9de8-8962345bce18(com.fasten.safety.bayesian_network.generator.templates@generator)">
-  <persistence version="9" />
-  <languages>
-    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
-  </languages>
-  <imports>
-    <import index="zqec" ref="r:4b509217-3274-43e6-be70-84e45864fd71(com.fasten.safety.bayesian_network.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="ngI" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="bUwia" id="3sgpJkb4cf_">
-    <property role="TrG5h" value="main" />
-  </node>
-</model>
-
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.behavior.mps
index e88f4ea25..6fdee49dc 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.behavior.mps
@@ -8,8 +8,6 @@
   </languages>
   <imports>
     <import index="zqec" ref="r:4b509217-3274-43e6-be70-84e45864fd71(com.fasten.safety.bayesian_network.structure)" />
-    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
-    <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.structure.mps
index 63c688ed3..2b4389112 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.structure.mps
@@ -6,7 +6,6 @@
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
-    <import index="ehqg" ref="r:2c1724e1-8ed6-4fe4-9e44-fae13cd2a5ac(com.mbeddr.formal.base.expressions.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
   <registry>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/com.fasten.safety.fmea.arch.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/com.fasten.safety.fmea.arch.mpl
index 4ea484704..7e77777ac 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/com.fasten.safety.fmea.arch.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/com.fasten.safety.fmea.arch.mpl
@@ -15,11 +15,9 @@
     <dependency reexport="false">b43c548b-f75f-46e2-ad24-de9edd93e95e(com.fasten.safety.fmea)</dependency>
     <dependency reexport="false">71797868-de95-425c-8470-36aa52c8ebc4(com.mbeddr.formal.base.arch)</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">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:7e450f4e-1ac3-41ef-a851-4598161bdb94:de.slisson.mps.tables" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
@@ -67,12 +65,6 @@
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="71797868-de95-425c-8470-36aa52c8ebc4(com.mbeddr.formal.base.arch)" version="0" />
     <module reference="b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)" 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="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.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="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.behavior.mps
index a24f2438e..ed6792e95 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.behavior.mps
@@ -9,7 +9,6 @@
   <imports>
     <import index="arip" ref="r:05796a31-2f42-44d2-9b5e-7769941d865b(com.fasten.safety.fmea.behavior)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
-    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
     <import index="3whv" ref="r:b1da8ad9-7b88-4c56-bf74-d8352a2282f9(com.mbeddr.formal.base.arch.structure)" />
     <import index="g9vz" ref="r:c54ad2e6-d537-48fe-8f9f-916529edd872(com.fasten.safety.fmea.arch.structure)" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.constraints.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.constraints.mps
index 355b514fa..a3682bdc1 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.constraints.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.constraints.mps
@@ -14,8 +14,6 @@
     <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
   </languages>
   <imports>
-    <import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
-    <import index="3whv" ref="r:b1da8ad9-7b88-4c56-bf74-d8352a2282f9(com.mbeddr.formal.base.arch.structure)" />
     <import index="g9vz" ref="r:c54ad2e6-d537-48fe-8f9f-916529edd872(com.fasten.safety.fmea.arch.structure)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="6k2r" ref="r:caa5c61b-1fdb-4b2d-a184-3bec7eaec4f9(com.fasten.safety.fmea.structure)" implicit="true" />
@@ -109,8 +107,5 @@
       </node>
     </node>
   </node>
-  <node concept="1M2fIO" id="7j1NWs14dDZ">
-    <ref role="1M2myG" to="g9vz:7j1NWs11KuC" resolve="ComponentInstanceSubject" />
-  </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.structure.mps
index c1f59f218..8f52213f5 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.structure.mps
@@ -3,13 +3,11 @@
   <persistence version="9" />
   <languages>
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
-    <use id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext" version="0" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
     <import index="6k2r" ref="r:caa5c61b-1fdb-4b2d-a184-3bec7eaec4f9(com.fasten.safety.fmea.structure)" />
     <import index="3whv" ref="r:b1da8ad9-7b88-4c56-bf74-d8352a2282f9(com.mbeddr.formal.base.arch.structure)" />
-    <import index="87nw" ref="r:ca2ab6bb-f6e7-4c0f-a88c-b78b9b31fff3(de.slisson.mps.richtext.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
   <registry>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/com.fasten.safety.ft.xfta_gen.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/com.fasten.safety.ft.xfta_gen.mpl
index 6667d3830..3c4ab7fee 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/com.fasten.safety.ft.xfta_gen.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/com.fasten.safety.ft.xfta_gen.mpl
@@ -30,7 +30,6 @@
       <languageVersions>
         <language slang="l:990507d3-3527-4c54-bfe9-0ca3c9c6247a:com.dslfoundry.plaintextgen" version="0" />
         <language slang="l:189537ea-2a28-44c9-91aa-a8e68b3e1e1b:com.mbeddr.mpsutil.blutil.genutil" version="0" />
-        <language slang="l:b67a6ca0-735e-4903-b238-4b525bddf96a:com.mbeddr.mpsutil.genutil" version="0" />
         <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="2" />
@@ -71,7 +70,6 @@
     <dependency reexport="false">ab274f70-5238-4883-adc7-02df7a757829(com.fasten.safety.ft)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
-    <dependency reexport="false">990507d3-3527-4c54-bfe9-0ca3c9c6247a(com.dslfoundry.plaintextgen)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -115,7 +113,6 @@
     <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="990507d3-3527-4c54-bfe9-0ca3c9c6247a(com.dslfoundry.plaintextgen)" version="0" />
     <module reference="ab274f70-5238-4883-adc7-02df7a757829(com.fasten.safety.ft)" version="0" />
     <module reference="091b20ea-7bf0-41d6-8e6e-4460a9bd8121(com.fasten.safety.ft.xfta_gen)" version="0" />
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/generator/templates/com.fasten.safety.ft.xfta_gen.templates@generator.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/generator/templates/com.fasten.safety.ft.xfta_gen.templates@generator.mps
index ba298e8be..cc649eb4a 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/generator/templates/com.fasten.safety.ft.xfta_gen.templates@generator.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/generator/templates/com.fasten.safety.ft.xfta_gen.templates@generator.mps
@@ -5,8 +5,6 @@
     <use id="479c7a8c-02f9-43b5-9139-d910cb22f298" name="jetbrains.mps.core.xml" version="0" />
     <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="4" />
     <use id="990507d3-3527-4c54-bfe9-0ca3c9c6247a" name="com.dslfoundry.plaintextgen" version="0" />
-    <use id="b67a6ca0-735e-4903-b238-4b525bddf96a" name="com.mbeddr.mpsutil.genutil" version="0" />
-    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="2" />
     <use id="189537ea-2a28-44c9-91aa-a8e68b3e1e1b" name="com.mbeddr.mpsutil.blutil.genutil" version="0" />
     <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
   </languages>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/models/com.fasten.safety.ft.xfta_gen.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/models/com.fasten.safety.ft.xfta_gen.structure.mps
index c1437ba20..581890dd8 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/models/com.fasten.safety.ft.xfta_gen.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/models/com.fasten.safety.ft.xfta_gen.structure.mps
@@ -2,7 +2,6 @@
 <model ref="r:0d8de557-bbe4-455a-a872-4eb6baf716c6(com.fasten.safety.ft.xfta_gen.structure)">
   <persistence version="9" />
   <languages>
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports />
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 65feb79e7..9a0323da1 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
@@ -14,7 +14,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">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>
     <dependency reexport="false">92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</dependency>
@@ -29,9 +28,7 @@
   <languageVersions>
     <language slang="l:120e1c9d-4e27-4478-b2af-b2c3bd3850b0:com.mbeddr.mpsutil.editor.querylist" 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="1" />
-    <language slang="l:56c81845-acaf-48a7-bcd8-e29b36c98dd7:de.itemis.mps.editor.diagram.styles" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
@@ -91,7 +88,6 @@
     <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="8ca79d43-eb45-4791-bdd4-0d6130ff895b(de.itemis.mps.editor.diagram.layout)" version="0" />
-    <module reference="56c81845-acaf-48a7-bcd8-e29b36c98dd7(de.itemis.mps.editor.diagram.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.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" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.editor.mps
index a0995810f..87039bba6 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.editor.mps
@@ -4,10 +4,8 @@
   <languages>
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
     <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="1" />
-    <use id="56c81845-acaf-48a7-bcd8-e29b36c98dd7" name="de.itemis.mps.editor.diagram.styles" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="c73b17af-16a1-4490-8072-8a84937c5206" name="com.mbeddr.mpsutil.treenotation" version="0" />
-    <use id="bda054c4-5d71-46ca-aba0-7104e3070b5a" name="com.mbeddr.mpsutil.treenotation.styles" version="0" />
     <use id="120e1c9d-4e27-4478-b2af-b2c3bd3850b0" name="com.mbeddr.mpsutil.editor.querylist" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -16,7 +14,6 @@
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="spwl" ref="r:ea5ecccc-669e-41c1-a43d-021bc4263d33(com.fasten.safety.ft.structure)" />
-    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="95j3" ref="r:b59c48c6-3515-4a72-8146-4b8c723b8307(com.mbeddr.formal.base.diagram_utils)" />
@@ -25,10 +22,10 @@
     <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" />
     <import index="e57x" ref="r:99808a14-1913-4248-aed8-3139a5d05f88(com.mbeddr.formal.base.styles)" />
     <import index="suqv" ref="r:9a28b49a-e98c-4186-a7e1-7e782b3f4fc3(de.itemis.mps.editor.diagram.layout.structure)" />
+    <import index="5un2" ref="r:00d6ee44-268c-4818-b3e7-4eecf669c7ee(com.mbeddr.mpsutil.treenotation.styles.editor)" />
     <import index="tbr6" ref="r:6a005c26-87c0-43c4-8cf3-49ffba1099df(de.slisson.mps.richtext.behavior)" implicit="true" />
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" implicit="true" />
     <import index="fazf" ref="r:28cb0bbd-efcb-4c9e-94f2-4ccc928adfb4(com.fasten.safety.ft.behavior)" implicit="true" />
-    <import index="5un2" ref="r:00d6ee44-268c-4818-b3e7-4eecf669c7ee(com.mbeddr.mpsutil.treenotation.styles.editor)" implicit="true" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
   </imports>
   <registry>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.intentions.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.intentions.mps
index bdfd7d224..7bc0d45c7 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.intentions.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.intentions.mps
@@ -11,7 +11,6 @@
     <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" />
     <import index="95j3" ref="r:b59c48c6-3515-4a72-8146-4b8c723b8307(com.mbeddr.formal.base.diagram_utils)" />
     <import index="suqv" ref="r:9a28b49a-e98c-4186-a7e1-7e782b3f4fc3(de.itemis.mps.editor.diagram.layout.structure)" />
-    <import index="ztk3" ref="r:1d7819a9-9001-45b3-8897-91b2f81186cb(com.mbeddr.formal.base.tooling.ui)" />
     <import index="3f8v" ref="r:50ca0529-8a5f-4820-895a-98152d428af3(com.fasten.safety.ft.plugin)" />
     <import index="mryx" ref="r:da23d8da-3a75-4f33-96d8-7b3d3c2b2ccd(com.mpsbasics.editor.utils.screenshooter)" />
     <import index="spwl" ref="r:ea5ecccc-669e-41c1-a43d-021bc4263d33(com.fasten.safety.ft.structure)" implicit="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.migration.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.migration.mps
index d945ff68c..bd16199d3 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.migration.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.migration.mps
@@ -3,17 +3,9 @@
   <persistence version="9" />
   <languages>
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
-    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
-    <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
     <devkit ref="2787ae0c-1f54-4fbf-b0b7-caf2b5beecbc(jetbrains.mps.devkit.aspect.migration)" />
   </languages>
-  <imports>
-    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
-    <import index="slm6" ref="90746344-04fd-4286-97d5-b46ae6a81709/r:52a3d974-bd4f-4651-ba6e-a2de5e336d95(jetbrains.mps.lang.migration/jetbrains.mps.lang.migration.methods)" />
-    <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
-  </imports>
+  <imports />
   <registry />
 </model>
 
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.plugin.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.plugin.mps
index f12e306ac..1da501602 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.plugin.mps
@@ -8,7 +8,6 @@
     <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="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query" version="3" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" 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>
@@ -17,14 +16,10 @@
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
     <import index="90d" ref="r:421d64ed-8024-497f-aeab-8bddeb389dd2(jetbrains.mps.lang.extension.methods)" />
     <import index="4agl" ref="r:fdf64437-9be3-455e-9c7a-77cc1026e250(com.mbeddr.formal.base.plugin)" />
-    <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
-    <import index="c8ee" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing.table(JDK/)" />
     <import index="spwl" ref="r:ea5ecccc-669e-41c1-a43d-021bc4263d33(com.fasten.safety.ft.structure)" />
     <import index="fazf" ref="r:28cb0bbd-efcb-4c9e-94f2-4ccc928adfb4(com.fasten.safety.ft.behavior)" />
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
-    <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
   </imports>
   <registry>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop.iso26262/com.fasten.safety.hazop.iso26262.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop.iso26262/com.fasten.safety.hazop.iso26262.mpl
index b8e3929a7..f76aa6ba9 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop.iso26262/com.fasten.safety.hazop.iso26262.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop.iso26262/com.fasten.safety.hazop.iso26262.mpl
@@ -11,60 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="com.fasten.safety.hazop.iso26262.generator" uuid="9e1d88fc-f602-4fce-a8da-b49212416b20">
-      <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="2" />
-        <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="7af989c3-8042-42ae-bf04-8bcfa8f9dbf9(com.fasten.safety.hazop)" version="0" />
-        <module reference="f610e51f-b05d-4ea8-a354-7ee51a81bcbc(com.fasten.safety.hazop.iso26262)" version="0" />
-        <module reference="9e1d88fc-f602-4fce-a8da-b49212416b20(com.fasten.safety.hazop.iso26262.generator)" version="0" />
-        <module reference="17da266c-02d9-4bbd-b69b-8a656b49f45c(com.mbeddr.formal.safety.hara)" 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="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.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>
   <dependencies>
     <dependency reexport="false">7af989c3-8042-42ae-bf04-8bcfa8f9dbf9(com.fasten.safety.hazop)</dependency>
     <dependency reexport="false">a798113f-e2cd-4e21-a8e2-ca1903cb9c43(com.mbeddr.formal.safety.iso26262)</dependency>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop.iso26262/generator/templates/com.fasten.safety.hazop.iso26262.generator.templates@generator.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop.iso26262/generator/templates/com.fasten.safety.hazop.iso26262.generator.templates@generator.mps
deleted file mode 100644
index c0170f532..000000000
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop.iso26262/generator/templates/com.fasten.safety.hazop.iso26262.generator.templates@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:be53cf7e-8b38-4698-a56b-58eb5f3460f5(com.fasten.safety.hazop.iso26262.generator.templates@generator)">
-  <persistence version="9" />
-  <languages>
-    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
-  </languages>
-  <imports>
-    <import index="bu0k" ref="r:c4968b48-8375-4bea-b8f6-95c3e18468d5(com.fasten.safety.hazop.iso26262.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="ngI" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="bUwia" id="3DZJpXNmwqt">
-    <property role="TrG5h" value="main" />
-  </node>
-</model>
-
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop.iso26262/models/com.fasten.safety.hazop.iso26262.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop.iso26262/models/com.fasten.safety.hazop.iso26262.structure.mps
index 78475e8e4..f81b85ce5 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop.iso26262/models/com.fasten.safety.hazop.iso26262.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop.iso26262/models/com.fasten.safety.hazop.iso26262.structure.mps
@@ -8,8 +8,8 @@
   <imports>
     <import index="2w7f" ref="r:ea300b49-36a6-4fa8-9ccd-411a1c328f70(com.fasten.safety.hazop.structure)" />
     <import index="1w8j" ref="r:0631ef51-dd11-46fa-a4db-001e68da09c6(com.mbeddr.formal.safety.iso26262.structure)" />
+    <import index="cjwq" ref="r:7e1f4da1-19b3-4ceb-bcab-0237eb7a50b7(com.mbeddr.formal.safety.hara.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
-    <import index="cjwq" ref="r:7e1f4da1-19b3-4ceb-bcab-0237eb7a50b7(com.mbeddr.formal.safety.hara.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources">
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/com.fasten.safety.hazop.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/com.fasten.safety.hazop.mpl
index d73d0cab8..c3e929f90 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/com.fasten.safety.hazop.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/com.fasten.safety.hazop.mpl
@@ -13,7 +13,6 @@
   <accessoryModels />
   <dependencies>
     <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">c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text)</dependency>
   </dependencies>
   <languageVersions>
@@ -61,12 +60,6 @@
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="7af989c3-8042-42ae-bf04-8bcfa8f9dbf9(com.fasten.safety.hazop)" version="0" />
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" 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="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.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" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/models/com.fasten.safety.hazop.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/models/com.fasten.safety.hazop.structure.mps
index 416d5eded..04b74e0fd 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/models/com.fasten.safety.hazop.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/models/com.fasten.safety.hazop.structure.mps
@@ -6,7 +6,6 @@
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
-    <import index="87nw" ref="r:ca2ab6bb-f6e7-4c0f-a88c-b78b9b31fff3(de.slisson.mps.richtext.structure)" />
     <import index="zqge" ref="r:59e90602-6655-4552-86eb-441a42a9a0e4(jetbrains.mps.lang.text.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/com.fasten.safety.hiphops.arch.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/com.fasten.safety.hiphops.arch.mpl
index 5e72e3ff2..c4783f70b 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/com.fasten.safety.hiphops.arch.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/com.fasten.safety.hiphops.arch.mpl
@@ -23,8 +23,6 @@
   <languageVersions>
     <language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="2" />
     <language slang="l:b4f35ed8-45af-4efa-abe4-00ac26956e69:com.mbeddr.mpsutil.grammarcells.runtimelang" version="0" />
-    <language slang="l:1919c723-b60b-4592-9318-9ce96d91da44:de.itemis.mps.editor.celllayout" version="0" />
-    <language slang="l:7e450f4e-1ac3-41ef-a851-4598161bdb94:de.slisson.mps.tables" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.behavior.mps
index 6968d8e3f..ab9a239a3 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.behavior.mps
@@ -12,15 +12,9 @@
     <import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
     <import index="3whv" ref="r:b1da8ad9-7b88-4c56-bf74-d8352a2282f9(com.mbeddr.formal.base.arch.structure)" />
     <import index="lr73" ref="r:47b9f784-2d4a-4adf-a2c1-7e71108590c5(com.fasten.safety.hiphops.behavior)" />
-    <import index="spwl" ref="r:ea5ecccc-669e-41c1-a43d-021bc4263d33(com.fasten.safety.ft.structure)" />
-    <import index="6k2r" ref="r:caa5c61b-1fdb-4b2d-a184-3bec7eaec4f9(com.fasten.safety.fmea.structure)" />
-    <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="zsc5" ref="r:fc2953cc-af52-42fa-8e2a-cc41987cb142(com.fasten.safety.hiphops.arch.structure)" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="ii8j" ref="r:a06544ed-39eb-44c0-b516-bb222deb41dc(com.fasten.safety.hiphops.structure)" />
-    <import index="ehqg" ref="r:2c1724e1-8ed6-4fe4-9e44-fae13cd2a5ac(com.mbeddr.formal.base.expressions.structure)" />
     <import index="7wf3" ref="r:c49134f0-ff6f-4ef4-ad9f-10c1a3f47c1a(com.mbeddr.formal.base.arch.behavior)" />
-    <import index="wid" ref="r:f00673e3-aa4b-47ab-b1ab-32f93476e624(com.fasten.safety.hiphops.arch.util)" />
     <import index="h4ob" ref="r:c1b5027c-c0fd-4ce6-a884-7934c1083045(com.fasten.safety.hiphops.util)" />
   </imports>
   <registry>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.editor.mps
index 635065828..5b3d5b225 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.editor.mps
@@ -3,8 +3,6 @@
   <persistence version="9" />
   <languages>
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
-    <use id="7e450f4e-1ac3-41ef-a851-4598161bdb94" name="de.slisson.mps.tables" version="0" />
-    <use id="1919c723-b60b-4592-9318-9ce96d91da44" name="de.itemis.mps.editor.celllayout" version="0" />
     <use id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.structure.mps
index 1c36137cd..7907fb577 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.structure.mps
@@ -9,7 +9,6 @@
     <import index="ii8j" ref="r:a06544ed-39eb-44c0-b516-bb222deb41dc(com.fasten.safety.hiphops.structure)" />
     <import index="ehqg" ref="r:2c1724e1-8ed6-4fe4-9e44-fae13cd2a5ac(com.mbeddr.formal.base.expressions.structure)" />
     <import index="6k2r" ref="r:caa5c61b-1fdb-4b2d-a184-3bec7eaec4f9(com.fasten.safety.fmea.structure)" />
-    <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="spwl" ref="r:ea5ecccc-669e-41c1-a43d-021bc4263d33(com.fasten.safety.ft.structure)" implicit="true" />
   </imports>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.util.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.util.mps
index 274e5fb0c..cd40fab09 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.util.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.util.mps
@@ -9,11 +9,9 @@
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="spwl" ref="r:ea5ecccc-669e-41c1-a43d-021bc4263d33(com.fasten.safety.ft.structure)" />
     <import index="ii8j" ref="r:a06544ed-39eb-44c0-b516-bb222deb41dc(com.fasten.safety.hiphops.structure)" />
     <import index="zsc5" ref="r:fc2953cc-af52-42fa-8e2a-cc41987cb142(com.fasten.safety.hiphops.arch.structure)" />
     <import index="6k2r" ref="r:caa5c61b-1fdb-4b2d-a184-3bec7eaec4f9(com.fasten.safety.fmea.structure)" />
-    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="ehqg" ref="r:2c1724e1-8ed6-4fe4-9e44-fae13cd2a5ac(com.mbeddr.formal.base.expressions.structure)" />
     <import index="3whv" ref="r:b1da8ad9-7b88-4c56-bf74-d8352a2282f9(com.mbeddr.formal.base.arch.structure)" />
     <import index="lr73" ref="r:47b9f784-2d4a-4adf-a2c1-7e71108590c5(com.fasten.safety.hiphops.behavior)" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops/models/com.fasten.safety.hiphops.util.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops/models/com.fasten.safety.hiphops.util.mps
index 3af2e01f6..2be1e361d 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops/models/com.fasten.safety.hiphops.util.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops/models/com.fasten.safety.hiphops.util.mps
@@ -12,7 +12,6 @@
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="spwl" ref="r:ea5ecccc-669e-41c1-a43d-021bc4263d33(com.fasten.safety.ft.structure)" />
     <import index="ehqg" ref="r:2c1724e1-8ed6-4fe4-9e44-fae13cd2a5ac(com.mbeddr.formal.base.expressions.structure)" />
-    <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
     <import index="6k2r" ref="r:caa5c61b-1fdb-4b2d-a184-3bec7eaec4f9(com.fasten.safety.fmea.structure)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="fazf" ref="r:28cb0bbd-efcb-4c9e-94f2-4ccc928adfb4(com.fasten.safety.ft.behavior)" implicit="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.jira_integration/models/com.mbeddr.formal.safety.argument.jira_integration.util.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.jira_integration/models/com.mbeddr.formal.safety.argument.jira_integration.util.mps
index 0900e1dc0..76298f065 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.jira_integration/models/com.mbeddr.formal.safety.argument.jira_integration.util.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.jira_integration/models/com.mbeddr.formal.safety.argument.jira_integration.util.mps
@@ -9,7 +9,6 @@
     <import index="e90" ref="r:c0e53d7d-69dd-4540-ad4f-45b89e942ba1(com.mbeddr.formal.safety.argument.visualisation.util)" />
     <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
-    <import index="qc1i" ref="r:1ce86501-ae64-40a6-b205-94ee6df6953f(com.mbeddr.formal.safety.argument.visualisation.editor)" />
     <import index="t49a" ref="56f134c7-a829-428d-9119-715369c69768/java:net.sf.jtreemap.swing(org.mpsqa.treemap.lib/)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="cxdr" ref="r:10e9be3d-5ae8-41d9-9554-78e944872df2(com.mpsbasics.jira.structure)" implicit="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/com.mbeddr.formal.safety.argument.modelquery.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/com.mbeddr.formal.safety.argument.modelquery.mpl
index 0d6476f06..dcaca82fe 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/com.mbeddr.formal.safety.argument.modelquery.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/com.mbeddr.formal.safety.argument.modelquery.mpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language namespace="com.mbeddr.formal.safety.argument.modelquery" uuid="57ecebe4-dfb8-4fef-9175-0008e04a3684" languageVersion="0" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
@@ -14,7 +14,7 @@
   <generators>
     <generator alias="main" namespace="com.mbeddr.formal.safety.argument.modelquery.generator" uuid="43d5f6b1-f45e-44e8-8beb-2ef9aabefcbc">
       <models>
-        <modelRoot contentPath="${module}/generator" type="default">
+        <modelRoot type="default" contentPath="${module}/generator">
           <sourceRoot location="templates" />
         </modelRoot>
       </models>
@@ -25,9 +25,7 @@
       </facets>
       <external-templates />
       <dependencies>
-        <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
         <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
-        <dependency reexport="false">1f4710e9-f074-4732-a0bd-6fa896d282b7(com.mpsbasics.project.utils)</dependency>
       </dependencies>
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -85,14 +83,12 @@
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
-    <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false" scope="generate-into">7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:f89904fb-9486-43a1-865e-5ad0375a8a88:de.itemis.mps.editor.bool" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
@@ -100,7 +96,6 @@
     <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:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
@@ -125,7 +120,6 @@
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <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:1a8554c4-eb84-43ba-8c34-6f0d90c6e75a:jetbrains.mps.lang.smodel.query" version="3" />
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
     <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" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/generator/templates/com.mbeddr.formal.safety.argument.modelquery.generator.templates@generator.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/generator/templates/com.mbeddr.formal.safety.argument.modelquery.generator.templates@generator.mps
index a384fdb4a..0167a0aad 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/generator/templates/com.mbeddr.formal.safety.argument.modelquery.generator.templates@generator.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/generator/templates/com.mbeddr.formal.safety.argument.modelquery.generator.templates@generator.mps
@@ -8,11 +8,8 @@
   </languages>
   <imports>
     <import index="9br2" ref="r:70aadfb3-8246-45ac-bcd1-b345c7f7cfe4(com.mbeddr.formal.safety.argument.modelquery.structure)" />
-    <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
-    <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
     <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
     <import index="oq0u" ref="r:e0fdabfa-18f0-4762-8817-0e7b1735bd5d(com.mbeddr.formal.safety.argument.modelquery.util)" />
-    <import index="agne" ref="r:2538c08a-32a3-4d93-89c3-b508268173db(com.mpsbasics.project.utils.project_finder)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.editor.mps
index be0eedd98..10b49dc65 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.editor.mps
@@ -4,16 +4,10 @@
   <languages>
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
-    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
-    <use id="f89904fb-9486-43a1-865e-5ad0375a8a88" name="de.itemis.mps.editor.bool" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
     <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
-    <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" />
-    <import index="hyam" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.event(JDK/)" />
-    <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
     <import index="9br2" ref="r:70aadfb3-8246-45ac-bcd1-b345c7f7cfe4(com.mbeddr.formal.safety.argument.modelquery.structure)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.plugin.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.plugin.mps
index 33edaefda..917e853af 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.plugin.mps
@@ -7,7 +7,6 @@
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <use id="c9d137c4-3259-44f8-80ff-33ab2b506ee4" name="jetbrains.mps.lang.util.order" version="0" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
-    <use id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query" version="3" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.typesystem.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.typesystem.mps
index 4caaae472..ee0d04c85 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.typesystem.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.typesystem.mps
@@ -7,13 +7,8 @@
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
-    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="oq0u" ref="r:e0fdabfa-18f0-4762-8817-0e7b1735bd5d(com.mbeddr.formal.safety.argument.modelquery.util)" />
-    <import index="t6h5" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang.reflect(JDK/)" />
-    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
-    <import index="3qmy" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.classloading(MPS.Core/)" />
     <import index="9br2" ref="r:70aadfb3-8246-45ac-bcd1-b345c7f7cfe4(com.mbeddr.formal.safety.argument.modelquery.structure)" implicit="true" />
   </imports>
   <registry>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.util.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.util.mps
index 10f4b56b6..b4d4fa44a 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.util.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.util.mps
@@ -2,11 +2,9 @@
 <model ref="r:e0fdabfa-18f0-4762-8817-0e7b1735bd5d(com.mbeddr.formal.safety.argument.modelquery.util)">
   <persistence version="9" />
   <languages>
-    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="yt22" ref="r:eeb370b6-780e-4985-945e-bbc5d9b97a6c(com.mbeddr.formal.safety.argument.modelquery.typesystem)" />
     <import index="3qmy" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.classloading(MPS.Core/)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="9br2" ref="r:70aadfb3-8246-45ac-bcd1-b345c7f7cfe4(com.mbeddr.formal.safety.argument.modelquery.structure)" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.util.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.util.mps
index e67759101..693b3ba44 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.util.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.util.mps
@@ -8,7 +8,6 @@
   <imports>
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
-    <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
   </imports>
   <registry>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/com.mbeddr.formal.safety.argument.process.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/com.mbeddr.formal.safety.argument.process.mpl
index f9a5ffa35..0ca05af4e 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/com.mbeddr.formal.safety.argument.process.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/com.mbeddr.formal.safety.argument.process.mpl
@@ -15,7 +15,6 @@
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
-    <dependency reexport="false">92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:31c91def-a131-41a1-9018-102874f49a12:de.slisson.mps.editor.multiline" version="0" />
@@ -71,11 +70,8 @@
     <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="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/models/com.mbeddr.formal.safety.argument.process.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/models/com.mbeddr.formal.safety.argument.process.structure.mps
index a60ca4782..5374dd821 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/models/com.mbeddr.formal.safety.argument.process.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/models/com.mbeddr.formal.safety.argument.process.structure.mps
@@ -7,7 +7,6 @@
   </languages>
   <imports>
     <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
-    <import index="87nw" ref="r:ca2ab6bb-f6e7-4c0f-a88c-b78b9b31fff3(de.slisson.mps.richtext.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
   <registry>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/models/com.mbeddr.formal.safety.argument.runtime.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/models/com.mbeddr.formal.safety.argument.runtime.editor.mps
index d24599847..809cc304e 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/models/com.mbeddr.formal.safety.argument.runtime.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/models/com.mbeddr.formal.safety.argument.runtime.editor.mps
@@ -11,11 +11,9 @@
     <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
     <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" />
-    <import index="f4zo" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.cells(MPS.Editor/)" />
     <import index="hyam" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.event(JDK/)" />
     <import index="nbuu" ref="r:d3d83931-eefd-4730-b0d1-738f46c08648(com.mbeddr.formal.safety.argument.runtime.plugin)" />
     <import index="p7rk" ref="r:67c63462-ea88-46dc-b31c-baa1d0218b8f(com.mbeddr.formal.safety.argument.runtime.pluginSolution.utils)" />
-    <import index="hh8v" ref="r:8abeb290-0d98-4a7f-81b4-e87446f9c414(com.mbeddr.formal.safety.argument.runtime.pluginSolution.plugin)" />
     <import index="vdvw" ref="r:0dab1cea-0da9-4395-bdbd-beac207923df(com.mbeddr.formal.safety.argument.runtime.structure)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/com.mbeddr.formal.safety.argument.spi.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/com.mbeddr.formal.safety.argument.spi.mpl
index c7c3a5558..65aedb8f5 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/com.mbeddr.formal.safety.argument.spi.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/com.mbeddr.formal.safety.argument.spi.mpl
@@ -14,8 +14,6 @@
   <dependencies>
     <dependency reexport="false">92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</dependency>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
-    <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-    <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
     <dependency reexport="false">13744753-c81f-424a-9c1b-cf8943bf4e86(jetbrains.mps.lang.sharedConcepts)</dependency>
   </dependencies>
@@ -27,7 +25,6 @@
     <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:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
     <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/models/com.mbeddr.formal.safety.argument.spi.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/models/com.mbeddr.formal.safety.argument.spi.behavior.mps
index d1221103f..c77c3c0a1 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/models/com.mbeddr.formal.safety.argument.spi.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/models/com.mbeddr.formal.safety.argument.spi.behavior.mps
@@ -4,7 +4,6 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
-    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query" version="3" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -14,7 +13,6 @@
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="tpcw" ref="r:00000000-0000-4000-0000-011c895902bc(jetbrains.mps.lang.sharedConcepts.structure)" />
     <import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
-    <import index="b19z" ref="r:11a68676-9d63-4e1c-b920-59aefe77def3(com.mbeddr.formal.base.structure)" />
     <import index="w873" ref="r:0de03bcd-6ad8-423c-b85e-ae3dd18ed2b3(com.mbeddr.formal.base.behavior)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
     <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" implicit="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/models/com.mbeddr.formal.safety.argument.spi.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/models/com.mbeddr.formal.safety.argument.spi.editor.mps
index 75eecba30..c5aa08553 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/models/com.mbeddr.formal.safety.argument.spi.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/models/com.mbeddr.formal.safety.argument.spi.editor.mps
@@ -4,14 +4,10 @@
   <languages>
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
-    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
     <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
-    <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" />
-    <import index="hyam" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.event(JDK/)" />
     <import index="3xw7" ref="r:03075676-dfa1-4f4e-aef4-a178c9f0fb17(com.mbeddr.formal.safety.argument.spi.structure)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/com.mbeddr.formal.safety.argument.visualisation.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/com.mbeddr.formal.safety.argument.visualisation.mpl
index 6dce273bb..81686e97c 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/com.mbeddr.formal.safety.argument.visualisation.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/com.mbeddr.formal.safety.argument.visualisation.mpl
@@ -16,7 +16,6 @@
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">56f134c7-a829-428d-9119-715369c69768(org.mpsqa.treemap.lib)</dependency>
-    <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/models/com.mbeddr.formal.safety.argument.visualisation.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/models/com.mbeddr.formal.safety.argument.visualisation.editor.mps
index d548b8450..95a1121ce 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/models/com.mbeddr.formal.safety.argument.visualisation.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/models/com.mbeddr.formal.safety.argument.visualisation.editor.mps
@@ -5,7 +5,6 @@
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
-    <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -13,9 +12,7 @@
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
     <import index="tlox" ref="56f134c7-a829-428d-9119-715369c69768/java:net.sf.jtreemap.swing.provider(org.mpsqa.treemap.lib/)" />
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
-    <import index="z1c3" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" />
-    <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
-    <import index="z1c4" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
+    <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="hyam" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.event(JDK/)" />
     <import index="t49a" ref="56f134c7-a829-428d-9119-715369c69768/java:net.sf.jtreemap.swing(org.mpsqa.treemap.lib/)" />
@@ -29,7 +26,6 @@
     <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="rgfa" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing.tree(JDK/)" />
-    <import index="e90" ref="r:c0e53d7d-69dd-4540-ad4f-45b89e942ba1(com.mbeddr.formal.safety.argument.visualisation.util)" />
     <import index="j8aq" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.module(MPS.Core/)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="t6h5" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang.reflect(JDK/)" />
@@ -493,7 +489,7 @@
                 <node concept="3cpWsn" id="1oXm7QRM5r6" role="3cpWs9">
                   <property role="TrG5h" value="proj" />
                   <node concept="3uibUv" id="1oXm7QRM5mm" role="1tU5fm">
-                    <ref role="3uigEE" to="z1c4:~Project" resolve="Project" />
+                    <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
                   </node>
                   <node concept="2OqwBi" id="1oXm7QRM5r7" role="33vP2m">
                     <node concept="2OqwBi" id="1oXm7QRM5r8" role="2Oq$k0">
@@ -610,7 +606,7 @@
     <node concept="312cEg" id="5Dw7oA61l$e" role="jymVt">
       <property role="TrG5h" value="proj" />
       <node concept="3uibUv" id="5Dw7oA61lut" role="1tU5fm">
-        <ref role="3uigEE" to="z1c4:~Project" resolve="Project" />
+        <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
       </node>
     </node>
     <node concept="312cEg" id="1oXm7QRJtFB" role="jymVt">
@@ -681,7 +677,7 @@
       <node concept="37vLTG" id="5Dw7oA61kKb" role="3clF46">
         <property role="TrG5h" value="proj" />
         <node concept="3uibUv" id="5Dw7oA61l6S" role="1tU5fm">
-          <ref role="3uigEE" to="z1c4:~Project" resolve="Project" />
+          <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
         </node>
       </node>
       <node concept="37vLTG" id="41Pak$lSbQB" role="3clF46">
@@ -794,7 +790,7 @@
               <ref role="3cqZAo" node="5Dw7oA61l$e" resolve="proj" />
             </node>
             <node concept="liA8E" id="7JEz8iltjLH" role="2OqNvi">
-              <ref role="37wK5l" to="z1c4:~Project.getRepository()" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
@@ -2133,7 +2129,7 @@
     <node concept="312cEg" id="3ErxEYacH2B" role="jymVt">
       <property role="TrG5h" value="proj" />
       <node concept="3uibUv" id="3ErxEYacC8$" role="1tU5fm">
-        <ref role="3uigEE" to="z1c4:~Project" resolve="Project" />
+        <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
       </node>
     </node>
     <node concept="Wx3nA" id="3ErxEYaaf2B" role="jymVt">
@@ -2307,7 +2303,7 @@
       <node concept="37vLTG" id="3ErxEYacKXV" role="3clF46">
         <property role="TrG5h" value="proj" />
         <node concept="3uibUv" id="3ErxEYacO9M" role="1tU5fm">
-          <ref role="3uigEE" to="z1c4:~Project" resolve="Project" />
+          <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
         </node>
       </node>
     </node>
@@ -2707,7 +2703,7 @@
                     <ref role="3cqZAo" node="3ErxEYacH2B" resolve="proj" />
                   </node>
                   <node concept="liA8E" id="3ErxEYaht09" role="2OqNvi">
-                    <ref role="37wK5l" to="z1c4:~Project.getRepository()" resolve="getRepository" />
+                    <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                   </node>
                 </node>
               </node>
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 1145cb5fc..950a0a10a 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
@@ -14,7 +14,6 @@
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" />
     <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
     <import index="fbzs" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.geom(JDK/)" />
-    <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
     <import index="swi3" ref="r:5eabed4f-92f5-4459-b9b3-e2faa24f3467(de.itemis.mps.editor.diagram.styles.editor)" />
     <import index="cdmc" ref="r:d4129e7d-34b5-4657-8b81-f5b9fbe93567(com.mbeddr.formal.safety.cae.structure)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/com.mbeddr.formal.safety.gsn.confidence.acp.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/com.mbeddr.formal.safety.gsn.confidence.acp.mpl
index bfd04ed73..d4cf21a4d 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/com.mbeddr.formal.safety.gsn.confidence.acp.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/com.mbeddr.formal.safety.gsn.confidence.acp.mpl
@@ -16,11 +16,8 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
-    <dependency reexport="false">e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)</dependency>
-    <dependency reexport="false">1f4710e9-f074-4732-a0bd-6fa896d282b7(com.mpsbasics.project.utils)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="1" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
@@ -70,10 +67,8 @@
     <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="e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)" version="0" />
     <module reference="e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)" version="0" />
     <module reference="00a2e56d-f195-410b-8afe-5a3c7e505658(com.mbeddr.formal.safety.gsn.confidence.acp)" version="0" />
-    <module reference="1f4710e9-f074-4732-a0bd-6fa896d282b7(com.mpsbasics.project.utils)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="7b45fa94-2707-4a1a-9e6a-ce40c4aaf35a(de.itemis.mps.editor.collapsible.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.plugin.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.plugin.mps
index 1e9c99e0e..11bd36b41 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.plugin.mps
@@ -10,22 +10,15 @@
     <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" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="1" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="e57x" ref="r:99808a14-1913-4248-aed8-3139a5d05f88(com.mbeddr.formal.base.styles)" />
     <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
     <import index="90d" ref="r:421d64ed-8024-497f-aeab-8bddeb389dd2(jetbrains.mps.lang.extension.methods)" />
-    <import index="4agl" ref="r:fdf64437-9be3-455e-9c7a-77cc1026e250(com.mbeddr.formal.base.plugin)" />
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
     <import index="p9qi" ref="r:94782d44-f686-44fb-91cc-c56382ab8756(com.mbeddr.formal.safety.gsn.plugin)" />
-    <import index="nkm5" ref="r:095345ad-6627-42ca-9d3f-fc1b2d9fbd61(de.itemis.mps.editor.diagram.runtime.model)" />
     <import index="fbzs" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.geom(JDK/)" />
-    <import index="g35p" ref="r:53f7c624-e35c-46e0-a6cd-4bcccc2b91f5(com.mbeddr.formal.safety.gsn.editor)" />
-    <import index="2y64" ref="r:b91d3184-5a2f-40d8-b310-14ec3048d9cc(com.mbeddr.formal.base.tooling.project)" />
-    <import index="agne" ref="r:2538c08a-32a3-4d93-89c3-b508268173db(com.mpsbasics.project.utils.project_finder)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="kqaf" ref="r:6cc86fc4-3f69-4213-8f49-ef9fcbc7cb5f(com.mbeddr.formal.safety.gsn.confidence.acp.structure)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.mpl
index 9dc5a9383..baa84af32 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.mpl
@@ -19,14 +19,6 @@
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:83ed2dfe-f724-46cc-852a-dce086daee3f:com.mbeddr.formal.base" version="0" />
-    <language slang="l:e8a04d94-4307-4f88-95a2-25f7c4f39437:com.mbeddr.formal.safety.gsn" version="3" />
-    <language slang="l:00a2e56d-f195-410b-8afe-5a3c7e505658:com.mbeddr.formal.safety.gsn.confidence.acp" version="0" />
-    <language slang="l:6464626a-ab04-4051-908e-5e8dc75acd78:com.mbeddr.formal.safety.gsn.ext" version="2" />
-    <language slang="l:f89904fb-9486-43a1-865e-5ad0375a8a88:de.itemis.mps.editor.bool" version="0" />
-    <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="1" />
-    <language slang="l:8ca79d43-eb45-4791-bdd4-0d6130ff895b:de.itemis.mps.editor.diagram.layout" version="0" />
-    <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.behavior.mps
index d8ee58d44..49e6c62cc 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.behavior.mps
@@ -4,14 +4,10 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="89jy" ref="r:b084f3b4-d6a1-4460-8222-b4a956bb5d23(com.mbeddr.formal.safety.gsn.behavior)" />
-    <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
     <import index="w873" ref="r:0de03bcd-6ad8-423c-b85e-ae3dd18ed2b3(com.mbeddr.formal.base.behavior)" />
-    <import index="c366" ref="r:3118059b-5e2a-4cf8-b2e0-4218ed318875(com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.editor)" />
     <import index="6oah" ref="r:c3ace323-0a57-4f8d-b471-fad629604601(com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.structure)" />
     <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
     <import index="amuf" ref="r:b775b7e1-c824-441c-afe0-ed9eafc83544(com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.plugin)" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.constraints.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.constraints.mps
index 22874dea8..ae930cef8 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.constraints.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.constraints.mps
@@ -11,16 +11,12 @@
     <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
     <use id="3ad5badc-1d9c-461c-b7b1-fa2fcd0a0ae7" name="jetbrains.mps.lang.context" version="0" />
     <use id="ad93155d-79b2-4759-b10c-55123e763903" name="jetbrains.mps.lang.messages" version="0" />
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
-    <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
-    <use id="e8a04d94-4307-4f88-95a2-25f7c4f39437" name="com.mbeddr.formal.safety.gsn" version="3" />
     <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
   </languages>
   <imports>
     <import index="6oah" ref="r:c3ace323-0a57-4f8d-b471-fad629604601(com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.structure)" />
     <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
     <import index="89jy" ref="r:b084f3b4-d6a1-4460-8222-b4a956bb5d23(com.mbeddr.formal.safety.gsn.behavior)" />
-    <import index="c366" ref="r:3118059b-5e2a-4cf8-b2e0-4218ed318875(com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.editor)" />
     <import index="amuf" ref="r:b775b7e1-c824-441c-afe0-ed9eafc83544(com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.plugin)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.editor.mps
index 69005c863..9ec790a09 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.editor.mps
@@ -4,9 +4,6 @@
   <languages>
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
-    <use id="00a2e56d-f195-410b-8afe-5a3c7e505658" name="com.mbeddr.formal.safety.gsn.confidence.acp" version="0" />
-    <use id="f89904fb-9486-43a1-865e-5ad0375a8a88" name="de.itemis.mps.editor.bool" version="0" />
-    <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.intentions.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.intentions.mps
index 7799d7e83..62b3c19ad 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.intentions.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.intentions.mps
@@ -7,11 +7,8 @@
   </languages>
   <imports>
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
-    <import index="nkm5" ref="r:095345ad-6627-42ca-9d3f-fc1b2d9fbd61(de.itemis.mps.editor.diagram.runtime.model)" />
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
     <import index="c8ee" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing.table(JDK/)" />
-    <import index="amuf" ref="r:b775b7e1-c824-441c-afe0-ed9eafc83544(com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.plugin)" />
-    <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" implicit="true" />
     <import index="89jy" ref="r:b084f3b4-d6a1-4460-8222-b4a956bb5d23(com.mbeddr.formal.safety.gsn.behavior)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.plugin.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.plugin.mps
index 0616e6d70..7aaf5a1da 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.plugin.mps
@@ -10,7 +10,6 @@
     <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" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="6464626a-ab04-4051-908e-5e8dc75acd78" name="com.mbeddr.formal.safety.gsn.ext" version="-1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/com.mbeddr.formal.safety.gsn.doc.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/com.mbeddr.formal.safety.gsn.doc.mpl
index 28d099599..8582c2ede 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/com.mbeddr.formal.safety.gsn.doc.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/com.mbeddr.formal.safety.gsn.doc.mpl
@@ -131,7 +131,6 @@
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:52733268-be24-4f5f-ab84-a73b7c0c03b0:de.slisson.mps.richtext.customcell" version="0" />
     <language slang="l:7e450f4e-1ac3-41ef-a851-4598161bdb94:de.slisson.mps.tables" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
@@ -155,7 +154,6 @@
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
     <language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
-    <language slang="l:9882f4ad-1955-46fe-8269-94189e5dbbf2:jetbrains.mps.lang.migration.util" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/generator/templates/com.mbeddr.formal.safety.gsn.doc.generator.config.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/generator/templates/com.mbeddr.formal.safety.gsn.doc.generator.config.mps
index 106acee89..d18bfa0a2 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/generator/templates/com.mbeddr.formal.safety.gsn.doc.generator.config.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/generator/templates/com.mbeddr.formal.safety.gsn.doc.generator.config.mps
@@ -33,13 +33,13 @@
     <node concept="2SbYGw" id="5t37uj6$zuI" role="A10yx">
       <property role="TrG5h" value="temp" />
       <node concept="9PVaO" id="5t37uj6$zuJ" role="9PVG_">
-        <property role="3N1Lgt" value="models" />
+        <property role="3N1Lgt" value="tmp" />
       </node>
     </node>
     <node concept="2SbYGw" id="5t37uj6$zuK" role="Cbewh">
       <property role="TrG5h" value="img" />
       <node concept="9PVaO" id="5t37uj6$zuL" role="9PVG_">
-        <property role="3N1Lgt" value="models" />
+        <property role="3N1Lgt" value="tmp" />
       </node>
     </node>
   </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.editor.mps
index 74217d889..5fc4a03fe 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.editor.mps
@@ -3,7 +3,6 @@
   <persistence version="9" />
   <languages>
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
-    <use id="52733268-be24-4f5f-ab84-a73b7c0c03b0" name="de.slisson.mps.richtext.customcell" version="0" />
     <use id="7e450f4e-1ac3-41ef-a851-4598161bdb94" name="de.slisson.mps.tables" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -11,7 +10,6 @@
     <import index="2c95" ref="r:5f7188a9-e7b4-4a2e-bef9-38d2cf379fdc(com.mbeddr.doc.structure)" />
     <import index="r4b4" ref="r:1784e088-20fd-4fdb-96b8-bc57f0056d94(com.mbeddr.core.base.editor)" />
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
-    <import index="23h6" ref="r:7141fd54-a831-41ba-8753-74008b0b9af4(de.slisson.mps.richtext.editor)" />
     <import index="4gky" ref="r:e1dfab1d-c7a7-43e7-9f26-028afd483e82(com.mbeddr.doc.behavior)" />
     <import index="z726" ref="r:6b7eb85f-64d8-4de6-8906-0e18804729df(com.mbeddr.doc.editor)" />
     <import index="wvti" ref="r:b5f49a49-cb87-432f-9c94-6a91c1e055e1(com.mbeddr.formal.safety.gsn.doc.structure)" implicit="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.migration.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.migration.mps
index 58cc60a1c..bc378c9a1 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.migration.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/models/com.mbeddr.formal.safety.gsn.doc.migration.mps
@@ -3,7 +3,6 @@
   <persistence version="9" />
   <languages>
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
-    <use id="9882f4ad-1955-46fe-8269-94189e5dbbf2" name="jetbrains.mps.lang.migration.util" version="0" />
     <devkit ref="2787ae0c-1f54-4fbf-b0b7-caf2b5beecbc(jetbrains.mps.devkit.aspect.migration)" />
   </languages>
   <imports />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/com.mbeddr.formal.safety.gsn.ext.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/com.mbeddr.formal.safety.gsn.ext.mpl
index e65a4ae01..c01edbbdb 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/com.mbeddr.formal.safety.gsn.ext.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/com.mbeddr.formal.safety.gsn.ext.mpl
@@ -18,17 +18,13 @@
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
-    <dependency reexport="false">6464626a-ab04-4051-908e-5e8dc75acd78(com.mbeddr.formal.safety.gsn.ext)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">8ca79d43-eb45-4791-bdd4-0d6130ff895b(de.itemis.mps.editor.diagram.layout)</dependency>
     <dependency reexport="false">e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)</dependency>
-    <dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</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:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
-    <language slang="l:120e1c9d-4e27-4478-b2af-b2c3bd3850b0:com.mbeddr.mpsutil.editor.querylist" version="0" />
     <language slang="l:f89904fb-9486-43a1-865e-5ad0375a8a88:de.itemis.mps.editor.bool" version="0" />
     <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="1" />
     <language slang="l:52733268-be24-4f5f-ab84-a73b7c0c03b0:de.slisson.mps.richtext.customcell" version="0" />
@@ -36,7 +32,6 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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="2" />
-    <language slang="l:73736c50-f124-433b-b789-2828a15a0adc:jetbrains.mps.baseLanguage.collections.trove" version="0" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
@@ -59,7 +54,6 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
-    <language slang="l:9882f4ad-1955-46fe-8269-94189e5dbbf2:jetbrains.mps.lang.migration.util" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
@@ -104,13 +98,10 @@
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
-    <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="c0080a47-7e37-4558-bee9-9ae18e690549(jetbrains.mps.lang.extension)" version="0" />
     <module reference="528ff3b9-5fc4-40dd-931f-c6ce3650640e(jetbrains.mps.lang.migration.runtime)" version="0" />
-    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
-    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
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 08f6a67f6..06e4a9ef5 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
@@ -4,8 +4,6 @@
   <languages>
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
     <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="1" />
-    <use id="120e1c9d-4e27-4478-b2af-b2c3bd3850b0" name="com.mbeddr.mpsutil.editor.querylist" version="0" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="52733268-be24-4f5f-ab84-a73b7c0c03b0" name="de.slisson.mps.richtext.customcell" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="f89904fb-9486-43a1-865e-5ad0375a8a88" name="de.itemis.mps.editor.bool" version="0" />
@@ -20,14 +18,7 @@
     <import index="xm38" ref="r:d81a00b5-7941-4066-9929-d2d2283d4215(com.mbeddr.formal.base.tooling.vcs)" />
     <import index="lbo2" ref="r:0f81d0ca-0757-4ee3-8a9a-ba988c2c39e3(com.mbeddr.formal.safety.gsn.ext.structure)" />
     <import index="23h6" ref="r:7141fd54-a831-41ba-8753-74008b0b9af4(de.slisson.mps.richtext.editor)" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" />
-    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
-    <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
-    <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
-    <import index="g3l6" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.extapi.model(MPS.Core/)" />
-    <import index="mcvo" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.adapter.structure.language(MPS.Core/)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
     <import index="5pac" ref="r:c1e7e8ce-abfe-4b41-9ced-20ab8db5bd60(com.mbeddr.formal.safety.gsn.ext.behavior)" implicit="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.intentions.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.intentions.mps
index 5195a8910..444e1b06c 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.intentions.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.intentions.mps
@@ -5,7 +5,6 @@
     <use id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" name="jetbrains.mps.lang.intentions" version="1" />
     <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.migration.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.migration.mps
index 933b584f6..58dab9d79 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.migration.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.migration.mps
@@ -3,7 +3,6 @@
   <persistence version="9" />
   <languages>
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
-    <use id="9882f4ad-1955-46fe-8269-94189e5dbbf2" name="jetbrains.mps.lang.migration.util" version="0" />
     <devkit ref="2787ae0c-1f54-4fbf-b0b7-caf2b5beecbc(jetbrains.mps.devkit.aspect.migration)" />
   </languages>
   <imports />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.plugin.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.plugin.mps
index eeffdcd52..a983d12f8 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.plugin.mps
@@ -8,7 +8,6 @@
     <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="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
-    <use id="73736c50-f124-433b-b789-2828a15a0adc" name="jetbrains.mps.baseLanguage.collections.trove" 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>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.typesystem.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.typesystem.mps
index 9a6953c9a..8ff61ddce 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.typesystem.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.typesystem.mps
@@ -6,7 +6,6 @@
     <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
   </languages>
   <imports>
-    <import index="a26" ref="r:b988bb97-cb77-4d7a-a6c4-09b093af22b3(com.mbeddr.formal.safety.gsn.typesystem)" />
     <import index="lbo2" ref="r:0f81d0ca-0757-4ee3-8a9a-ba988c2c39e3(com.mbeddr.formal.safety.gsn.ext.structure)" />
     <import index="eczd" ref="r:dd550c2a-2764-4271-8387-b3bf83be80dd(com.mbeddr.formal.base.typesystem)" />
     <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" implicit="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.editor.mps
index 725b6f32d..121f8fcec 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.editor.mps
@@ -5,7 +5,6 @@
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="f89904fb-9486-43a1-865e-5ad0375a8a88" name="de.itemis.mps.editor.bool" version="0" />
-    <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -15,7 +14,6 @@
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
     <import index="hyam" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.event(JDK/)" />
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
-    <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
     <import index="kq9k" ref="r:26cf53ce-de1d-47e1-8acc-79dd464f660a(com.mbeddr.formal.safety.gsn.external_evidence.util)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="s9pq" ref="r:8ef909e6-5cd8-45b2-9793-5a70f4829a0a(com.mbeddr.formal.safety.gsn.external_evidence.structure)" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.intentions.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.intentions.mps
index 687efa59a..a7648d1de 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.intentions.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.intentions.mps
@@ -3,14 +3,11 @@
   <persistence version="9" />
   <languages>
     <use id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" name="jetbrains.mps.lang.intentions" version="1" />
-    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
     <import index="kq9k" ref="r:26cf53ce-de1d-47e1-8acc-79dd464f660a(com.mbeddr.formal.safety.gsn.external_evidence.util)" />
-    <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
-    <import index="48kf" ref="r:5f41c82d-84d1-4fb1-a1cf-6697d2365854(com.mbeddr.mpsutil.filepicker.behavior)" />
     <import index="s9pq" ref="r:8ef909e6-5cd8-45b2-9793-5a70f4829a0a(com.mbeddr.formal.safety.gsn.external_evidence.structure)" />
   </imports>
   <registry>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.util.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.util.mps
index a35779033..e2a5700b3 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.util.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.util.mps
@@ -18,7 +18,6 @@
     <import index="48kf" ref="r:5f41c82d-84d1-4fb1-a1cf-6697d2365854(com.mbeddr.mpsutil.filepicker.behavior)" />
     <import index="25x5" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.text(JDK/)" />
     <import index="jgjw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.security(JDK/)" />
-    <import index="6kvn" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.xml.datatype(JDK/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.importer/com.mbeddr.formal.safety.gsn.importer.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.importer/com.mbeddr.formal.safety.gsn.importer.mpl
index b83ffbcd3..efb70d8bb 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.importer/com.mbeddr.formal.safety.gsn.importer.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.importer/com.mbeddr.formal.safety.gsn.importer.mpl
@@ -23,7 +23,6 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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="2" />
-    <language slang="l:73736c50-f124-433b-b789-2828a15a0adc:jetbrains.mps.baseLanguage.collections.trove" version="0" />
     <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" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.importer/models/com.mbeddr.formal.safety.gsn.importer.util.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.importer/models/com.mbeddr.formal.safety.gsn.importer.util.mps
index 50ce87d81..249e56d85 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.importer/models/com.mbeddr.formal.safety.gsn.importer.util.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.importer/models/com.mbeddr.formal.safety.gsn.importer.util.mps
@@ -2,7 +2,6 @@
 <model ref="r:ebac6728-c6a8-4013-bfe5-28454fe70ff7(com.mbeddr.formal.safety.gsn.importer.util)">
   <persistence version="9" />
   <languages>
-    <use id="73736c50-f124-433b-b789-2828a15a0adc" name="jetbrains.mps.baseLanguage.collections.trove" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/com.mbeddr.formal.safety.gsn.odd.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/com.mbeddr.formal.safety.gsn.odd.mpl
index ec2dc04b1..767afa09a 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/com.mbeddr.formal.safety.gsn.odd.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/com.mbeddr.formal.safety.gsn.odd.mpl
@@ -16,7 +16,7 @@
   <generators>
     <generator alias="main" namespace="com.mbeddr.formal.safety.gsn.odd#01" uuid="0cd4968b-4ddc-4835-aa0f-2a9e87b43fae">
       <models>
-        <modelRoot contentPath="${module}/generator/template" type="default">
+        <modelRoot type="default" contentPath="${module}/generator/template">
           <sourceRoot location="." />
         </modelRoot>
       </models>
@@ -25,17 +25,12 @@
           <classes generated="true" path="${module}/generator/classes_gen" />
         </facet>
       </facets>
-      <external-templates>
-        <generator generatorUID="c8e6f2e2-b259-48b5-b060-c6f2b36ed359(com.mbeddr.formal.spin#5285453794051996712)" />
-      </external-templates>
+      <external-templates />
       <dependencies>
         <dependency reexport="false">001b2375-3bd5-4d5e-9958-6b3f62dc8548(com.mbeddr.formal.nusmv)</dependency>
         <dependency reexport="false">ad8d48af-022b-40dc-8979-2b76074fb438(com.mbeddr.formal.spin)</dependency>
-        <dependency reexport="false">c0e6afd4-e20f-4e33-9970-004cf26b9bf6(com.mbeddr.formal.nusmv.ext)</dependency>
         <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
-        <dependency reexport="false">b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)</dependency>
         <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-        <dependency reexport="false">ef89f137-f966-4966-a202-ab9ea26e79fe(com.mbeddr.formal.spin.c.core)</dependency>
         <dependency reexport="false">1caff2e8-9e73-431d-8a8f-ba34a80c305f(com.mbeddr.formal.nusmv.cbd#01)</dependency>
       </dependencies>
       <languageVersions>
@@ -77,13 +72,10 @@
         <module reference="b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)" version="0" />
         <module reference="001b2375-3bd5-4d5e-9958-6b3f62dc8548(com.mbeddr.formal.nusmv)" version="0" />
         <module reference="1caff2e8-9e73-431d-8a8f-ba34a80c305f(com.mbeddr.formal.nusmv.cbd#01)" version="0" />
-        <module reference="c0e6afd4-e20f-4e33-9970-004cf26b9bf6(com.mbeddr.formal.nusmv.ext)" version="0" />
         <module reference="e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)" version="0" />
         <module reference="8c301636-fbda-4009-bce8-7e00c3c1bac5(com.mbeddr.formal.safety.gsn.odd)" version="0" />
         <module reference="0cd4968b-4ddc-4835-aa0f-2a9e87b43fae(com.mbeddr.formal.safety.gsn.odd#01)" version="0" />
         <module reference="ad8d48af-022b-40dc-8979-2b76074fb438(com.mbeddr.formal.spin)" version="0" />
-        <module reference="c8e6f2e2-b259-48b5-b060-c6f2b36ed359(com.mbeddr.formal.spin#5285453794051996712)" version="0" />
-        <module reference="ef89f137-f966-4966-a202-ab9ea26e79fe(com.mbeddr.formal.spin.c.core)" version="0" />
         <module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" 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" />
@@ -96,7 +88,6 @@
         <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" />
         <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>
       <mapping-priorities>
         <mapping-priority-rule kind="strictly_before">
@@ -124,7 +115,6 @@
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">22a84bd5-d947-48ae-b9f6-8288eea41dce(com.mbeddr.formal.nusmv.arch)</dependency>
-    <dependency reexport="false">8c301636-fbda-4009-bce8-7e00c3c1bac5(com.mbeddr.formal.safety.gsn.odd)</dependency>
     <dependency reexport="false">b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)</dependency>
   </dependencies>
   <languageVersions>
@@ -132,7 +122,6 @@
     <language slang="l:b0b65429-cd22-4e2a-83e7-cd58bc6dd72f:com.mbeddr.formal.base.expressions" version="0" />
     <language slang="l:ad8d48af-022b-40dc-8979-2b76074fb438:com.mbeddr.formal.spin" version="0" />
     <language slang="l:ef89f137-f966-4966-a202-ab9ea26e79fe:com.mbeddr.formal.spin.c.core" version="0" />
-    <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="1" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/generator/template/main@generator.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/generator/template/main@generator.mps
index 57842abdf..b8aa82444 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/generator/template/main@generator.mps
@@ -10,11 +10,8 @@
     <import index="m8ix" ref="r:8c05a6b2-545c-43c6-8991-74f629fa152b(com.mbeddr.formal.safety.gsn.odd.util)" />
     <import index="bl1s" ref="r:c4255d6a-5e54-4d68-b4c9-c8d34b4aa181(com.mbeddr.formal.safety.gsn.odd.c_api)" />
     <import index="o3hv" ref="r:b3500a5a-8007-441a-b8a4-ba1b48ead2e8(com.mbeddr.formal.spin.structure)" />
-    <import index="6z8w" ref="r:d4c22a7f-7332-4377-bba1-18afaeea0257(com.mbeddr.formal.nusmv.ext.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
-    <import index="btm1" ref="b0f8641f-bd77-4421-8425-30d9088a82f7/java:org.apache.commons.lang3(org.apache.commons/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="vshk" ref="r:dc20c736-549c-48b4-b95d-eb5e0a95f624(com.mbeddr.formal.spin.c.core.structure)" />
     <import index="gioj" ref="r:a6dee7e9-c79f-4293-b631-7c366a8877df(com.mbeddr.formal.nusmv.structure)" implicit="true" />
     <import index="ehqg" ref="r:2c1724e1-8ed6-4fe4-9e44-fae13cd2a5ac(com.mbeddr.formal.base.expressions.structure)" implicit="true" />
     <import index="48kf" ref="r:5f41c82d-84d1-4fb1-a1cf-6697d2365854(com.mbeddr.mpsutil.filepicker.behavior)" implicit="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.behavior.mps
index 9186e0e42..361ffc922 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.behavior.mps
@@ -9,7 +9,6 @@
   <imports>
     <import index="89jy" ref="r:b084f3b4-d6a1-4460-8222-b4a956bb5d23(com.mbeddr.formal.safety.gsn.behavior)" />
     <import index="oqu9" ref="r:55c09d3a-85de-4c18-ab69-cda997480b6a(com.mbeddr.formal.spin.behavior)" />
-    <import index="o3hv" ref="r:b3500a5a-8007-441a-b8a4-ba1b48ead2e8(com.mbeddr.formal.spin.structure)" />
     <import index="m8ix" ref="r:8c05a6b2-545c-43c6-8991-74f629fa152b(com.mbeddr.formal.safety.gsn.odd.util)" />
     <import index="z4ol" ref="r:a03a882e-be67-46a6-adb2-41cedc56b233(com.mbeddr.formal.safety.gsn.odd.structure)" />
   </imports>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.editor.mps
index 80cef2874..35ca8ac44 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.editor.mps
@@ -3,7 +3,6 @@
   <persistence version="9" />
   <languages>
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
-    <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -12,7 +11,6 @@
     <import index="z4ol" ref="r:a03a882e-be67-46a6-adb2-41cedc56b233(com.mbeddr.formal.safety.gsn.odd.structure)" />
     <import index="48kf" ref="r:5f41c82d-84d1-4fb1-a1cf-6697d2365854(com.mbeddr.mpsutil.filepicker.behavior)" />
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="g35p" ref="r:53f7c624-e35c-46e0-a6cd-4bcccc2b91f5(com.mbeddr.formal.safety.gsn.editor)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.structure.mps
index e94b16c68..86ed988f8 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.structure.mps
@@ -9,7 +9,7 @@
     <import index="gioj" ref="r:a6dee7e9-c79f-4293-b631-7c366a8877df(com.mbeddr.formal.nusmv.structure)" />
     <import index="68mc" ref="r:2a10821d-612f-4a73-b7b0-ed6b57106321(com.mbeddr.mpsutil.filepicker.structure)" />
     <import index="o3hv" ref="r:b3500a5a-8007-441a-b8a4-ba1b48ead2e8(com.mbeddr.formal.spin.structure)" />
-    <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" implicit="true" />
+    <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
   <registry>
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 13503a0b3..1ea17d722 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
@@ -15,7 +15,6 @@
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">17da266c-02d9-4bbd-b69b-8a656b49f45c(com.mbeddr.formal.safety.hara)</dependency>
-    <dependency reexport="false">f465db4c-63d4-40ef-afda-acd713dc19a1(com.mbeddr.formal.safety.gsn.patterns)</dependency>
     <dependency reexport="false">c0080a47-7e37-4558-bee9-9ae18e690549(jetbrains.mps.lang.extension)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">0deccdfd-196b-4d8c-895e-0d6cb8014dfd(com.mbeddr.formal.req.base)</dependency>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.actions.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.actions.mps
index 67f08f40e..607a5ab2b 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.actions.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.actions.mps
@@ -3,7 +3,6 @@
   <persistence version="9" />
   <languages>
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
-    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.behavior.mps
index 5fc9b334a..d3ddb76cf 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.behavior.mps
@@ -17,10 +17,10 @@
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
-    <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="tbr6" ref="r:6a005c26-87c0-43c4-8cf3-49ffba1099df(de.slisson.mps.richtext.behavior)" />
     <import index="z27p" ref="r:9796df7f-5d01-4a46-b1e4-58be8e3ac472(com.mbeddr.formal.req.base.structure)" implicit="true" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
@@ -61,6 +61,7 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
+      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
@@ -112,9 +113,15 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
+      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
+      <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
+        <child id="1163668914799" name="condition" index="3K4Cdx" />
+        <child id="1163668922816" name="ifTrue" index="3K4E3e" />
+        <child id="1163668934364" name="ifFalse" index="3K4GZi" />
+      </concept>
       <concept id="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
         <reference id="5497648299878491909" name="baseVariableDeclaration" index="1M0zk5" />
       </concept>
@@ -1147,22 +1154,44 @@
             <node concept="2jxLKc" id="1qK9rHkkaRt" role="1tU5fm" />
           </node>
         </node>
+        <node concept="3cpWs8" id="1a4oUCoKnan" role="3cqZAp">
+          <node concept="3cpWsn" id="1a4oUCoKnaq" role="3cpWs9">
+            <property role="TrG5h" value="compName" />
+            <node concept="17QB3L" id="1a4oUCoKnal" role="1tU5fm" />
+            <node concept="3K4zz7" id="1a4oUCoKoky" role="33vP2m">
+              <node concept="Xl_RD" id="1a4oUCoKorv" role="3K4GZi">
+                <property role="Xl_RC" value="null" />
+              </node>
+              <node concept="3y3z36" id="1a4oUCoKnWF" role="3K4Cdx">
+                <node concept="10Nm6u" id="1a4oUCoKohK" role="3uHU7w" />
+                <node concept="BsUDl" id="1a4oUCoKnKY" role="3uHU7B">
+                  <ref role="37wK5l" node="ZaBFheHlsu" resolve="getComponent" />
+                </node>
+              </node>
+              <node concept="2OqwBi" id="1a4oUCoKqz7" role="3K4E3e">
+                <node concept="2OqwBi" id="1qK9rHkke2P" role="2Oq$k0">
+                  <node concept="2JrnkZ" id="1qK9rHkkdGc" role="2Oq$k0">
+                    <node concept="BsUDl" id="1qK9rHkkdgH" role="2JrQYb">
+                      <ref role="37wK5l" node="ZaBFheHlsu" resolve="getComponent" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="1qK9rHkkebQ" role="2OqNvi">
+                    <ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="1a4oUCoKsMs" role="2OqNvi">
+                  <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3cpWs6" id="1qK9rHkkcoE" role="3cqZAp">
           <node concept="3cpWs3" id="1qK9rHkkcoF" role="3cqZAk">
             <node concept="Xl_RD" id="1qK9rHkkcoG" role="3uHU7w">
               <property role="Xl_RC" value=")" />
             </node>
             <node concept="3cpWs3" id="1qK9rHkkd7b" role="3uHU7B">
-              <node concept="2OqwBi" id="1qK9rHkke2P" role="3uHU7w">
-                <node concept="2JrnkZ" id="1qK9rHkkdGc" role="2Oq$k0">
-                  <node concept="BsUDl" id="1qK9rHkkdgH" role="2JrQYb">
-                    <ref role="37wK5l" node="ZaBFheHlsu" resolve="getComponent" />
-                  </node>
-                </node>
-                <node concept="liA8E" id="1qK9rHkkebQ" role="2OqNvi">
-                  <ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
-                </node>
-              </node>
               <node concept="3cpWs3" id="1qK9rHkkcoI" role="3uHU7B">
                 <node concept="2OqwBi" id="1qK9rHkkcoJ" role="3uHU7B">
                   <node concept="2OqwBi" id="1qK9rHkkcoK" role="2Oq$k0">
@@ -1175,6 +1204,9 @@
                   <property role="Xl_RC" value="(" />
                 </node>
               </node>
+              <node concept="37vLTw" id="1a4oUCoKqcH" role="3uHU7w">
+                <ref role="3cqZAo" node="1a4oUCoKnaq" resolve="compName" />
+              </node>
             </node>
           </node>
         </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.editor.mps
index db9a293ca..b1e3a41eb 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.editor.mps
@@ -42,6 +42,8 @@
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
       <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
+        <property id="1214560368769" name="emptyNoTargetText" index="39s7Ar" />
+        <property id="1139852716018" name="noTargetText" index="1$x2rV" />
         <property id="1140017977771" name="readOnly" index="1Intyy" />
         <property id="1140114345053" name="allowEmptyText" index="1O74Pk" />
         <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
@@ -144,6 +146,8 @@
         </node>
       </node>
       <node concept="1iCGBv" id="2rzNEUxND_p" role="3EZMnx">
+        <property role="39s7Ar" value="true" />
+        <property role="1$x2rV" value="req-doc" />
         <ref role="1NtTu8" to="2qxf:2rzNEUxND_8" resolve="requirementDocument" />
         <node concept="1sVBvm" id="2rzNEUxND_q" role="1sWHZn">
           <node concept="3F0A7n" id="2rzNEUxND_r" role="2wV5jI">
@@ -179,6 +183,7 @@
         </node>
       </node>
       <node concept="1iCGBv" id="65LrkjiWSIu" role="3EZMnx">
+        <property role="1$x2rV" value="req" />
         <ref role="1NtTu8" to="2qxf:65LrkjiWSI5" resolve="requirement" />
         <node concept="1sVBvm" id="65LrkjiWSIv" role="1sWHZn">
           <node concept="3F0A7n" id="65LrkjiWSIw" role="2wV5jI">
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/models/com.mbeddr.formal.safety.gsn.pdfexport.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/models/com.mbeddr.formal.safety.gsn.pdfexport.editor.mps
index bb6094a03..ce4699572 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/models/com.mbeddr.formal.safety.gsn.pdfexport.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/models/com.mbeddr.formal.safety.gsn.pdfexport.editor.mps
@@ -7,7 +7,6 @@
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="1ob6" ref="r:f44404ed-5270-44f9-8e19-281b0df5835d(com.mpsbasics.pdfexporter.structure)" />
     <import index="e4i3" ref="r:ba0a53f2-78bd-4230-9576-68a1e8855e28(com.mpsbasics.pdfexporter.editor)" />
     <import index="z1f2" ref="r:b350b49f-d62a-46db-826a-8c341f599d9e(com.mbeddr.formal.safety.gsn.pdfexport.structure)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/com.mbeddr.formal.safety.gsn.smv.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/com.mbeddr.formal.safety.gsn.smv.mpl
index 1724b03a6..f90cb68fd 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/com.mbeddr.formal.safety.gsn.smv.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/com.mbeddr.formal.safety.gsn.smv.mpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language namespace="com.mbeddr.formal.safety.gsn.smv" uuid="7f3eac5a-7f9a-4fbe-8264-f69c70ece985" languageVersion="9" moduleVersion="8">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
@@ -11,67 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="com.mbeddr.formal.safety.gsn.smv#01" uuid="0281c698-7f76-4575-85b2-63ede6a1e805">
-      <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="2" />
-        <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="7f3eac5a-7f9a-4fbe-8264-f69c70ece985(com.mbeddr.formal.safety.gsn.smv)" version="8" />
-        <module reference="0281c698-7f76-4575-85b2-63ede6a1e805(com.mbeddr.formal.safety.gsn.smv#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>
   <dependencies>
     <dependency reexport="false">001b2375-3bd5-4d5e-9958-6b3f62dc8548(com.mbeddr.formal.nusmv)</dependency>
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
@@ -81,14 +20,11 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">cac6875e-14fd-4552-a69e-b3168e27e2ff(com.mbeddr.formal.nusmv.tests)</dependency>
     <dependency reexport="false">8da51702-0e05-44c8-96db-8f11d1457c0c(com.mpsbasics.snode.utils)</dependency>
-    <dependency reexport="false">7f3eac5a-7f9a-4fbe-8264-f69c70ece985(com.mbeddr.formal.safety.gsn.smv)</dependency>
     <dependency reexport="false">f465db4c-63d4-40ef-afda-acd713dc19a1(com.mbeddr.formal.safety.gsn.patterns)</dependency>
     <dependency reexport="false">92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
-    <dependency reexport="false">71797868-de95-425c-8470-36aa52c8ebc4(com.mbeddr.formal.base.arch)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="1" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
@@ -112,7 +48,6 @@
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
     <language slang="l:c0080a47-7e37-4558-bee9-9ae18e690549:jetbrains.mps.lang.extension" version="2" />
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
-    <language slang="l:9882f4ad-1955-46fe-8269-94189e5dbbf2:jetbrains.mps.lang.migration.util" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
@@ -138,7 +73,6 @@
     <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="71797868-de95-425c-8470-36aa52c8ebc4(com.mbeddr.formal.base.arch)" version="0" />
     <module reference="b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)" version="0" />
     <module reference="001b2375-3bd5-4d5e-9958-6b3f62dc8548(com.mbeddr.formal.nusmv)" version="0" />
     <module reference="cac6875e-14fd-4552-a69e-b3168e27e2ff(com.mbeddr.formal.nusmv.tests)" version="0" />
@@ -170,7 +104,6 @@
   <extendedLanguages>
     <extendedLanguage>e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</extendedLanguage>
     <extendedLanguage>92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</extendedLanguage>
-    <extendedLanguage>f465db4c-63d4-40ef-afda-acd713dc19a1(com.mbeddr.formal.safety.gsn.patterns)</extendedLanguage>
   </extendedLanguages>
 </language>
 
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/generator/template/main@generator.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/generator/template/main@generator.mps
deleted file mode 100644
index cdbaf05ed..000000000
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/generator/template/main@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:6f2b5040-8c96-4d9d-a206-36d7fbcfa042(main@generator)">
-  <persistence version="9" />
-  <languages>
-    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
-  </languages>
-  <imports>
-    <import index="bsp8" ref="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.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="ngI" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="bUwia" id="4dCoQOftxs4">
-    <property role="TrG5h" value="main" />
-  </node>
-</model>
-
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.actions.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.actions.mps
index 822bedb1f..2823c9ab3 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.actions.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.actions.mps
@@ -8,8 +8,6 @@
   <imports>
     <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
     <import index="bsp8" ref="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" />
-    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
-    <import index="87nw" ref="r:ca2ab6bb-f6e7-4c0f-a88c-b78b9b31fff3(de.slisson.mps.richtext.structure)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.behavior.mps
index 08ac22e34..abeed5da7 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.behavior.mps
@@ -12,7 +12,6 @@
     <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
     <import index="u35n" ref="r:f917b204-e25c-4286-9eae-9081d5f78a78(com.mpsbasics.snode.utils.hashcode)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
-    <import index="g8ih" ref="r:d04ada13-9d56-43be-9fbe-16c353913377(com.mbeddr.formal.safety.gsn.patterns.behavior)" />
   </imports>
   <registry>
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.editor.mps
index 93907f8ed..d9b4abef5 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.editor.mps
@@ -3,16 +3,12 @@
   <persistence version="9" />
   <languages>
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
-    <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
     <import index="g35p" ref="r:53f7c624-e35c-46e0-a6cd-4bcccc2b91f5(com.mbeddr.formal.safety.gsn.editor)" />
-    <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
-    <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
-    <import index="tbr6" ref="r:6a005c26-87c0-43c4-8cf3-49ffba1099df(de.slisson.mps.richtext.behavior)" />
     <import index="bsp8" ref="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" />
   </imports>
   <registry>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.migration.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.migration.mps
index 1f3b60bf9..90f0f4831 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.migration.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.migration.mps
@@ -3,18 +3,9 @@
   <persistence version="9" />
   <languages>
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
-    <use id="9882f4ad-1955-46fe-8269-94189e5dbbf2" name="jetbrains.mps.lang.migration.util" version="0" />
-    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
-    <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
     <devkit ref="2787ae0c-1f54-4fbf-b0b7-caf2b5beecbc(jetbrains.mps.devkit.aspect.migration)" />
   </languages>
-  <imports>
-    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
-    <import index="slm6" ref="90746344-04fd-4286-97d5-b46ae6a81709/r:52a3d974-bd4f-4651-ba6e-a2de5e336d95(jetbrains.mps.lang.migration/jetbrains.mps.lang.migration.methods)" />
-    <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
-  </imports>
+  <imports />
   <registry />
 </model>
 
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.plugin.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.plugin.mps
index 9cebbb14b..14f7364fc 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.plugin.mps
@@ -14,9 +14,7 @@
     <import index="p9qi" ref="r:94782d44-f686-44fb-91cc-c56382ab8756(com.mbeddr.formal.safety.gsn.plugin)" />
     <import index="90d" ref="r:421d64ed-8024-497f-aeab-8bddeb389dd2(jetbrains.mps.lang.extension.methods)" />
     <import index="nkm5" ref="r:095345ad-6627-42ca-9d3f-fc1b2d9fbd61(de.itemis.mps.editor.diagram.runtime.model)" />
-    <import index="fbzs" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.geom(JDK/)" />
     <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
-    <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="bsp8" ref="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" implicit="true" />
     <import index="2qxf" ref="r:92bf1daa-4510-4ff1-a9b1-c695f68c3f1d(com.mbeddr.formal.safety.gsn.patterns.structure)" implicit="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.structure.mps
index 292bac063..075d3911a 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.structure.mps
@@ -11,9 +11,7 @@
     <import index="gioj" ref="r:a6dee7e9-c79f-4293-b631-7c366a8877df(com.mbeddr.formal.nusmv.structure)" />
     <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
     <import index="fnq2" ref="r:412c918d-151c-45fe-acf3-0268d0d563c1(com.mbeddr.formal.nusmv.tests.structure)" />
-    <import index="2qxf" ref="r:92bf1daa-4510-4ff1-a9b1-c695f68c3f1d(com.mbeddr.formal.safety.gsn.patterns.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
-    <import index="3whv" ref="r:b1da8ad9-7b88-4c56-bf74-d8352a2282f9(com.mbeddr.formal.base.arch.structure)" />
   </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.gsn.web/com.mbeddr.formal.safety.gsn.web.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.web/com.mbeddr.formal.safety.gsn.web.mpl
index d215e69af..5d16e9c24 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.web/com.mbeddr.formal.safety.gsn.web.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.web/com.mbeddr.formal.safety.gsn.web.mpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language namespace="com.mbeddr.formal.safety.gsn.web" uuid="0ca42a58-5150-4a55-89be-ba447ef72356" languageVersion="0" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
@@ -85,7 +85,6 @@
   <dependencies>
     <dependency reexport="false">8ca79d43-eb45-4791-bdd4-0d6130ff895b(de.itemis.mps.editor.diagram.layout)</dependency>
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
-    <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
   </dependencies>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.web/generator/templates/com.mbeddr.formal.safety.gsn.web.templates@generator.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.web/generator/templates/com.mbeddr.formal.safety.gsn.web.templates@generator.mps
index 5f63879f7..5ef3053ae 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.web/generator/templates/com.mbeddr.formal.safety.gsn.web.templates@generator.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.web/generator/templates/com.mbeddr.formal.safety.gsn.web.templates@generator.mps
@@ -7,11 +7,9 @@
     <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
   </languages>
   <imports>
-    <import index="sa8d" ref="r:c5621b37-b923-46a3-8714-0a00bc895859(com.mbeddr.formal.safety.gsn.web.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
-    <import index="nkm5" ref="r:095345ad-6627-42ca-9d3f-fc1b2d9fbd61(de.itemis.mps.editor.diagram.runtime.model)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="suqv" ref="r:9a28b49a-e98c-4186-a7e1-7e782b3f4fc3(de.itemis.mps.editor.diagram.layout.structure)" />
     <import index="ra3w" ref="r:d160eea8-047c-42af-ab07-6b169eeb13fd(com.mbeddr.formal.safety.gsn.web.util)" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.web/models/com.mbeddr.formal.safety.gsn.web.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.web/models/com.mbeddr.formal.safety.gsn.web.structure.mps
index 437df74b1..eb7e5ab71 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.web/models/com.mbeddr.formal.safety.gsn.web.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.web/models/com.mbeddr.formal.safety.gsn.web.structure.mps
@@ -2,7 +2,6 @@
 <model ref="r:c5621b37-b923-46a3-8714-0a00bc895859(com.mbeddr.formal.safety.gsn.web.structure)">
   <persistence version="9" />
   <languages>
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.web/models/com.mbeddr.formal.safety.gsn.web.util.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.web/models/com.mbeddr.formal.safety.gsn.web.util.mps
index ba9c4a5fd..a66faf30e 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.web/models/com.mbeddr.formal.safety.gsn.web.util.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.web/models/com.mbeddr.formal.safety.gsn.web.util.mps
@@ -7,11 +7,7 @@
   <imports>
     <import index="suqv" ref="r:9a28b49a-e98c-4186-a7e1-7e782b3f4fc3(de.itemis.mps.editor.diagram.layout.structure)" />
     <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
-    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="e57x" ref="r:99808a14-1913-4248-aed8-3139a5d05f88(com.mbeddr.formal.base.styles)" />
-    <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
-    <import index="nf7v" ref="r:323f2e16-a77b-4958-b026-25202f82daa5(com.mbeddr.formal.safety.gsn.util)" />
     <import index="95j3" ref="r:b59c48c6-3515-4a72-8146-4b8c723b8307(com.mbeddr.formal.base.diagram_utils)" />
   </imports>
   <registry>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.xml_gen/generator/templates/com.mbeddr.formal.safety.gsn.xml_gen.generator.templates@generator.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.xml_gen/generator/templates/com.mbeddr.formal.safety.gsn.xml_gen.generator.templates@generator.mps
index 5024fe5f3..056b6df78 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.xml_gen/generator/templates/com.mbeddr.formal.safety.gsn.xml_gen.generator.templates@generator.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.xml_gen/generator/templates/com.mbeddr.formal.safety.gsn.xml_gen.generator.templates@generator.mps
@@ -8,7 +8,6 @@
     <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
   </languages>
   <imports>
-    <import index="oel" ref="r:3aec10b4-7d8a-465c-a9ad-8ca4b82d85c1(com.mbeddr.formal.safety.gsn.xml_gen.structure)" />
     <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
     <import index="lbo2" ref="r:0f81d0ca-0757-4ee3-8a9a-ba988c2c39e3(com.mbeddr.formal.safety.gsn.ext.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/com.mbeddr.formal.safety.gsn.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/com.mbeddr.formal.safety.gsn.mpl
index 4912c17d0..3c594bc32 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/com.mbeddr.formal.safety.gsn.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/com.mbeddr.formal.safety.gsn.mpl
@@ -15,7 +15,6 @@
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-    <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
     <dependency reexport="true">1144260c-e9a5-49a2-9add-39a1a1a7077e(de.itemis.mps.editor.diagram.runtime)</dependency>
     <dependency reexport="false">c0080a47-7e37-4558-bee9-9ae18e690549(jetbrains.mps.lang.extension)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
@@ -26,17 +25,13 @@
     <dependency reexport="false">8da51702-0e05-44c8-96db-8f11d1457c0c(com.mpsbasics.snode.utils)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">6b84fb9e-5f09-4a61-bf31-3bfdc54820e3(com.mpsbasics.editor.utils)</dependency>
-    <dependency reexport="false">fa13cc63-c476-4d46-9c96-d53670abe7bc(de.itemis.mps.editor.diagram)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:120e1c9d-4e27-4478-b2af-b2c3bd3850b0:com.mbeddr.mpsutil.editor.querylist" version="0" />
-    <language slang="l:c73b17af-16a1-4490-8072-8a84937c5206:com.mbeddr.mpsutil.treenotation" version="0" />
     <language slang="l:f89904fb-9486-43a1-865e-5ad0375a8a88:de.itemis.mps.editor.bool" version="0" />
     <language slang="l:1919c723-b60b-4592-9318-9ce96d91da44:de.itemis.mps.editor.celllayout" version="0" />
     <language slang="l:3bdedd09-792a-4e15-a4db-83970df3ee86:de.itemis.mps.editor.collapsible" version="0" />
     <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="1" />
-    <language slang="l:31c91def-a131-41a1-9018-102874f49a12:de.slisson.mps.editor.multiline" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
@@ -93,7 +88,6 @@
     <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="fa13cc63-c476-4d46-9c96-d53670abe7bc(de.itemis.mps.editor.diagram)" 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" />
@@ -104,23 +98,14 @@
     <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="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-    <module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />
-    <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
-    <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="fdaaf35f-8ee3-4c37-b09d-9efaeaaa7a41(jetbrains.mps.core.tool.environment)" version="0" />
     <module reference="8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
-    <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
-    <module reference="18bc6592-03a6-4e29-a83a-7ff23bde13ba(jetbrains.mps.lang.editor)" version="0" />
     <module reference="c0080a47-7e37-4558-bee9-9ae18e690549(jetbrains.mps.lang.extension)" version="0" />
     <module reference="528ff3b9-5fc4-40dd-931f-c6ce3650640e(jetbrains.mps.lang.migration.runtime)" version="0" />
-    <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
-    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
-    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
-    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.constraints.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.constraints.mps
index d485bd45f..4c478c244 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.constraints.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.constraints.mps
@@ -314,9 +314,6 @@
       </node>
     </node>
   </node>
-  <node concept="1M2fIO" id="3f8ZVRYdw_A">
-    <ref role="1M2myG" to="py52:3GRi4m$qNsQ" resolve="GoalStructure" />
-  </node>
   <node concept="1M2fIO" id="3Px2xUV5DxF">
     <ref role="1M2myG" to="py52:3Px2xUV4m9W" resolve="GenericGSNAttributeAnnotationProvider" />
     <node concept="9S07l" id="3Px2xUV5DxG" role="9Vyp8">
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 15e0ee059..8ba4b59c8 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
@@ -4,16 +4,13 @@
   <languages>
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
     <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="1" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
     <use id="f89904fb-9486-43a1-865e-5ad0375a8a88" name="de.itemis.mps.editor.bool" version="0" />
     <use id="120e1c9d-4e27-4478-b2af-b2c3bd3850b0" name="com.mbeddr.mpsutil.editor.querylist" version="0" />
-    <use id="c73b17af-16a1-4490-8072-8a84937c5206" name="com.mbeddr.mpsutil.treenotation" version="0" />
     <use id="3bdedd09-792a-4e15-a4db-83970df3ee86" name="de.itemis.mps.editor.collapsible" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
-    <use id="31c91def-a131-41a1-9018-102874f49a12" name="de.slisson.mps.editor.multiline" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="1919c723-b60b-4592-9318-9ce96d91da44" name="de.itemis.mps.editor.celllayout" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
@@ -14129,6 +14126,7 @@
         <node concept="VPM3Z" id="336$aoTDWxE" role="3F10Kt" />
         <node concept="3F0ifn" id="336$aoTDWxF" role="3EZMnx">
           <property role="3F0ifm" value="Documentation:" />
+          <ref role="1k5W1q" node="4afdSTbTtoR" resolve="GSNTextualNotationBaseLanguageKeyword" />
         </node>
         <node concept="3F1sOY" id="336$aoTDWxG" role="3EZMnx">
           <ref role="1NtTu8" to="py52:336$aoT$ZLb" resolve="documentation" />
@@ -14902,5 +14900,31 @@
       </node>
     </node>
   </node>
+  <node concept="24kQdi" id="4yKSwbd2KSq">
+    <property role="3GE5qa" value="connections" />
+    <ref role="1XX52x" to="py52:2ccN23odOxd" resolve="GoalStructureConnectionBase" />
+    <node concept="2aJ2om" id="4yKSwbd2KSI" role="CpUAK">
+      <ref role="2$4xQ3" node="5uFV_KKBhnn" resolve="GOAL_STRUCTURE_TEXTUAL" />
+    </node>
+    <node concept="3F0ifn" id="4yKSwbd2RPD" role="2wV5jI" />
+  </node>
+  <node concept="24kQdi" id="4yKSwbd6Fxy">
+    <ref role="1XX52x" to="py52:336$aoT_UFY" resolve="GoalStructureDoc" />
+    <node concept="3F1sOY" id="4yKSwbd6Fxz" role="2wV5jI">
+      <ref role="1NtTu8" to="py52:336$aoT_UHh" resolve="documentation" />
+    </node>
+    <node concept="2aJ2om" id="4yKSwbd6Fx$" role="CpUAK">
+      <ref role="2$4xQ3" node="7olAlesPj8d" resolve="GOAL_STRUCTURE_TEXTUAL_FAST" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="4yKSwbd9z4I">
+    <ref role="1XX52x" to="py52:336$aoT_UFY" resolve="GoalStructureDoc" />
+    <node concept="3F1sOY" id="4yKSwbd9z4J" role="2wV5jI">
+      <ref role="1NtTu8" to="py52:336$aoT_UHh" resolve="documentation" />
+    </node>
+    <node concept="2aJ2om" id="4yKSwbd9z4K" role="CpUAK">
+      <ref role="2$4xQ3" node="4Cms47V74xp" resolve="GOAL_STRUCTURE_TREE_TABLE" />
+    </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 2f61fce40..9c7c339d7 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
@@ -8,7 +8,6 @@
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="ztk3" ref="r:1d7819a9-9001-45b3-8897-91b2f81186cb(com.mbeddr.formal.base.tooling.ui)" />
     <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" />
     <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
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 484fb6ffe..d8fbaa7e6 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
@@ -3,18 +3,9 @@
   <persistence version="9" />
   <languages>
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
-    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
-    <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
-    <use id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query" version="3" />
     <devkit ref="2787ae0c-1f54-4fbf-b0b7-caf2b5beecbc(jetbrains.mps.devkit.aspect.migration)" />
   </languages>
-  <imports>
-    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
-    <import index="slm6" ref="90746344-04fd-4286-97d5-b46ae6a81709/r:52a3d974-bd4f-4651-ba6e-a2de5e336d95(jetbrains.mps.lang.migration/jetbrains.mps.lang.migration.methods)" />
-    <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
-  </imports>
+  <imports />
   <registry />
 </model>
 
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.typesystem.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.typesystem.mps
index f85c7b442..37d84a734 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.typesystem.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.typesystem.mps
@@ -2,8 +2,6 @@
 <model ref="r:b988bb97-cb77-4d7a-a6c4-09b093af22b3(com.mbeddr.formal.safety.gsn.typesystem)">
   <persistence version="9" />
   <languages>
-    <use id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query" version="3" />
-    <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
     <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
   </languages>
   <imports>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.util.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.util.mps
index 89b9322b9..6cc5c9c0c 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.util.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.util.mps
@@ -8,8 +8,6 @@
   </languages>
   <imports>
     <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
-    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
-    <import index="b19z" ref="r:11a68676-9d63-4e1c-b920-59aefe77def3(com.mbeddr.formal.base.structure)" />
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
     <import index="e57x" ref="r:99808a14-1913-4248-aed8-3139a5d05f88(com.mbeddr.formal.base.styles)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/com.mbeddr.formal.safety.hara.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/com.mbeddr.formal.safety.hara.mpl
index dbe05ee04..e0529358c 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/com.mbeddr.formal.safety.hara.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/com.mbeddr.formal.safety.hara.mpl
@@ -13,7 +13,6 @@
   <accessoryModels />
   <dependencies>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
-    <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:7e450f4e-1ac3-41ef-a851-4598161bdb94:de.slisson.mps.tables" version="0" />
@@ -67,7 +66,6 @@
     <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="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
   </dependencyVersions>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.behavior.mps
index 39e73ec47..6ca8fd042 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.behavior.mps
@@ -9,7 +9,6 @@
   </languages>
   <imports>
     <import index="tbr6" ref="r:6a005c26-87c0-43c4-8cf3-49ffba1099df(de.slisson.mps.richtext.behavior)" />
-    <import index="87nw" ref="r:ca2ab6bb-f6e7-4c0f-a88c-b78b9b31fff3(de.slisson.mps.richtext.structure)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="cjwq" ref="r:7e1f4da1-19b3-4ceb-bcab-0237eb7a50b7(com.mbeddr.formal.safety.hara.structure)" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.constraints.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.constraints.mps
index 3c8536c70..fe07129f4 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.constraints.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.constraints.mps
@@ -11,14 +11,10 @@
     <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
     <use id="3ad5badc-1d9c-461c-b7b1-fa2fcd0a0ae7" name="jetbrains.mps.lang.context" version="0" />
     <use id="ad93155d-79b2-4759-b10c-55123e763903" name="jetbrains.mps.lang.messages" version="0" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
   </languages>
   <imports>
     <import index="cjwq" ref="r:7e1f4da1-19b3-4ceb-bcab-0237eb7a50b7(com.mbeddr.formal.safety.hara.structure)" />
-    <import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
   </imports>
   <registry>
     <language id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints">
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.editor.mps
index 1334ae6b6..b774df282 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.editor.mps
@@ -41,6 +41,7 @@
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
       <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
+        <property id="1139852716018" name="noTargetText" index="1$x2rV" />
         <property id="1140017977771" name="readOnly" index="1Intyy" />
         <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
       </concept>
@@ -229,6 +230,7 @@
         </node>
       </node>
       <node concept="1iCGBv" id="2RlaC$PcSj0" role="3EZMnx">
+        <property role="1$x2rV" value="hazards" />
         <ref role="1NtTu8" to="cjwq:2RlaC$Pcvh7" resolve="hazardsList" />
         <node concept="1sVBvm" id="2RlaC$PcSj2" role="1sWHZn">
           <node concept="3F0A7n" id="2RlaC$PcSjd" role="2wV5jI">
@@ -264,6 +266,7 @@
         </node>
       </node>
       <node concept="1iCGBv" id="2RlaC$PcChJ" role="3EZMnx">
+        <property role="1$x2rV" value="hazard" />
         <ref role="1NtTu8" to="cjwq:2RlaC$PcChp" resolve="hazard" />
         <node concept="1sVBvm" id="2RlaC$PcChL" role="1sWHZn">
           <node concept="3F0A7n" id="2RlaC$PcCi2" role="2wV5jI">
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/com.mbeddr.formal.safety.iso26262.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/com.mbeddr.formal.safety.iso26262.mpl
index 969277145..139ad680c 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/com.mbeddr.formal.safety.iso26262.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/com.mbeddr.formal.safety.iso26262.mpl
@@ -13,9 +13,7 @@
   <accessoryModels />
   <dependencies>
     <dependency reexport="false">17da266c-02d9-4bbd-b69b-8a656b49f45c(com.mbeddr.formal.safety.hara)</dependency>
-    <dependency reexport="false">b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
-    <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text)</dependency>
   </dependencies>
   <languageVersions>
@@ -45,7 +43,6 @@
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
@@ -67,7 +64,6 @@
     <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="17da266c-02d9-4bbd-b69b-8a656b49f45c(com.mbeddr.formal.safety.hara)" version="0" />
     <module reference="a798113f-e2cd-4e21-a8e2-ca1903cb9c43(com.mbeddr.formal.safety.iso26262)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.migration.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.migration.mps
index b3dc28205..62b901f34 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.migration.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.migration.mps
@@ -3,17 +3,9 @@
   <persistence version="9" />
   <languages>
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
-    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
-    <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
     <devkit ref="2787ae0c-1f54-4fbf-b0b7-caf2b5beecbc(jetbrains.mps.devkit.aspect.migration)" />
   </languages>
-  <imports>
-    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
-    <import index="slm6" ref="90746344-04fd-4286-97d5-b46ae6a81709/r:52a3d974-bd4f-4651-ba6e-a2de5e336d95(jetbrains.mps.lang.migration/jetbrains.mps.lang.migration.methods)" />
-    <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
-  </imports>
+  <imports />
   <registry />
 </model>
 
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.structure.mps
index fe0a64b0e..3cea95a80 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.structure.mps
@@ -8,7 +8,6 @@
   </languages>
   <imports>
     <import index="cjwq" ref="r:7e1f4da1-19b3-4ceb-bcab-0237eb7a50b7(com.mbeddr.formal.safety.hara.structure)" />
-    <import index="ehqg" ref="r:2c1724e1-8ed6-4fe4-9e44-fae13cd2a5ac(com.mbeddr.formal.base.expressions.structure)" />
     <import index="zqge" ref="r:59e90602-6655-4552-86eb-441a42a9a0e4(jetbrains.mps.lang.text.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="87nw" ref="r:ca2ab6bb-f6e7-4c0f-a88c-b78b9b31fff3(de.slisson.mps.richtext.structure)" implicit="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/com.mbeddr.formal.safety.req.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/com.mbeddr.formal.safety.req.mpl
index 11195f731..274a00866 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/com.mbeddr.formal.safety.req.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/com.mbeddr.formal.safety.req.mpl
@@ -11,69 +11,12 @@
     </facet>
   </facets>
   <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="com.mbeddr.formal.safety.req#01" uuid="40737904-e87f-4008-8d74-4d30b5b852db">
-      <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="2" />
-        <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="0deccdfd-196b-4d8c-895e-0d6cb8014dfd(com.mbeddr.formal.req.base)" version="0" />
-        <module reference="434b2bfb-bd7a-47c9-bced-b445035e6d96(com.mbeddr.formal.safety.req)" version="0" />
-        <module reference="40737904-e87f-4008-8d74-4d30b5b852db(com.mbeddr.formal.safety.req#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="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.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>
   <dependencies>
     <dependency reexport="false">0deccdfd-196b-4d8c-895e-0d6cb8014dfd(com.mbeddr.formal.req.base)</dependency>
     <dependency reexport="false">17da266c-02d9-4bbd-b69b-8a656b49f45c(com.mbeddr.formal.safety.hara)</dependency>
-    <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">7e777b53-0a6b-4719-b36d-10475788d49f(com.mbeddr.formal.safety.stamp)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="2" />
-    <language slang="l:b4f35ed8-45af-4efa-abe4-00ac26956e69:com.mbeddr.mpsutil.grammarcells.runtimelang" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
@@ -97,7 +40,6 @@
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
-    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/generator/template/main@generator.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/generator/template/main@generator.mps
deleted file mode 100644
index a6ed69a06..000000000
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/generator/template/main@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:d274fe35-aebe-498c-b7b5-eddb64ff53a7(main@generator)">
-  <persistence version="9" />
-  <languages>
-    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
-  </languages>
-  <imports>
-    <import index="30zx" ref="r:c74e2282-8641-453d-b9cc-e065e14a0117(com.mbeddr.formal.safety.req.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="ngI" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="bUwia" id="5r2fDr4pukw">
-    <property role="TrG5h" value="main" />
-  </node>
-</model>
-
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.editor.mps
index c5107e628..a9070fcbc 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.editor.mps
@@ -3,7 +3,6 @@
   <persistence version="9" />
   <languages>
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
-    <use id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.migration.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.migration.mps
index fabc45b70..9d40e770e 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.migration.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.migration.mps
@@ -3,17 +3,9 @@
   <persistence version="9" />
   <languages>
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
-    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
-    <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
     <devkit ref="2787ae0c-1f54-4fbf-b0b7-caf2b5beecbc(jetbrains.mps.devkit.aspect.migration)" />
   </languages>
-  <imports>
-    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
-    <import index="slm6" ref="90746344-04fd-4286-97d5-b46ae6a81709/r:52a3d974-bd4f-4651-ba6e-a2de5e336d95(jetbrains.mps.lang.migration/jetbrains.mps.lang.migration.methods)" />
-    <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
-  </imports>
+  <imports />
   <registry />
 </model>
 
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.structure.mps
index f415e402a..a870d3d6a 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.structure.mps
@@ -3,7 +3,6 @@
   <persistence version="9" />
   <languages>
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
-    <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/com.mbeddr.formal.safety.stamp.ext.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/com.mbeddr.formal.safety.stamp.ext.mpl
index 83a446ff3..c27fcb9cd 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/com.mbeddr.formal.safety.stamp.ext.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/com.mbeddr.formal.safety.stamp.ext.mpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language namespace="com.mbeddr.formal.safety.stamp.ext" uuid="eccaed1c-88f4-4a5c-9ad8-d1b8c9f330e9" languageVersion="0" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
@@ -11,65 +11,10 @@
     </facet>
   </facets>
   <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="com.mbeddr.formal.safety.stamp.ext#01" uuid="119e1bc3-08f2-4439-aade-f3cd419cfee0">
-      <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="2" />
-        <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="7e777b53-0a6b-4719-b36d-10475788d49f(com.mbeddr.formal.safety.stamp)" version="0" />
-        <module reference="eccaed1c-88f4-4a5c-9ad8-d1b8c9f330e9(com.mbeddr.formal.safety.stamp.ext)" version="0" />
-        <module reference="119e1bc3-08f2-4439-aade-f3cd419cfee0(com.mbeddr.formal.safety.stamp.ext#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="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.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>
   <dependencies>
     <dependency reexport="false">7e777b53-0a6b-4719-b36d-10475788d49f(com.mbeddr.formal.safety.stamp)</dependency>
     <dependency reexport="false">17da266c-02d9-4bbd-b69b-8a656b49f45c(com.mbeddr.formal.safety.hara)</dependency>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
-    <dependency reexport="false">434b2bfb-bd7a-47c9-bced-b445035e6d96(com.mbeddr.formal.safety.req)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
   </dependencies>
@@ -116,9 +61,7 @@
     <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="0deccdfd-196b-4d8c-895e-0d6cb8014dfd(com.mbeddr.formal.req.base)" version="0" />
     <module reference="17da266c-02d9-4bbd-b69b-8a656b49f45c(com.mbeddr.formal.safety.hara)" version="0" />
-    <module reference="434b2bfb-bd7a-47c9-bced-b445035e6d96(com.mbeddr.formal.safety.req)" version="0" />
     <module reference="7e777b53-0a6b-4719-b36d-10475788d49f(com.mbeddr.formal.safety.stamp)" version="0" />
     <module reference="eccaed1c-88f4-4a5c-9ad8-d1b8c9f330e9(com.mbeddr.formal.safety.stamp.ext)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/generator/templates/main@generator.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/generator/templates/main@generator.mps
deleted file mode 100644
index 8d92eff50..000000000
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/generator/templates/main@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:62ade46d-a19a-4435-82e2-4db3ad00e893(main@generator)">
-  <persistence version="9" />
-  <languages>
-    <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
-  </languages>
-  <imports>
-    <import index="8war" ref="r:b49c7957-4334-4f1e-b689-693d5ae0d5f7(com.mbeddr.formal.safety.stamp.ext.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="ngI" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="bUwia" id="7BYuSCF_BGj">
-    <property role="TrG5h" value="main" />
-  </node>
-</model>
-
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/models/com.mbeddr.formal.safety.stamp.ext.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/models/com.mbeddr.formal.safety.stamp.ext.behavior.mps
index 65347967a..69d40d630 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/models/com.mbeddr.formal.safety.stamp.ext.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/models/com.mbeddr.formal.safety.stamp.ext.behavior.mps
@@ -8,7 +8,6 @@
   </languages>
   <imports>
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
-    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="8war" ref="r:b49c7957-4334-4f1e-b689-693d5ae0d5f7(com.mbeddr.formal.safety.stamp.ext.structure)" />
   </imports>
   <registry>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/models/com.mbeddr.formal.safety.stamp.ext.structure.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/models/com.mbeddr.formal.safety.stamp.ext.structure.mps
index 4521b8bf6..218b67520 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/models/com.mbeddr.formal.safety.stamp.ext.structure.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/models/com.mbeddr.formal.safety.stamp.ext.structure.mps
@@ -8,8 +8,8 @@
   <imports>
     <import index="bewr" ref="r:a5d87024-d7b0-459e-b0ec-a9c089196f41(com.mbeddr.formal.safety.stamp.structure)" />
     <import index="cjwq" ref="r:7e1f4da1-19b3-4ceb-bcab-0237eb7a50b7(com.mbeddr.formal.safety.hara.structure)" />
+    <import index="87nw" ref="r:ca2ab6bb-f6e7-4c0f-a88c-b78b9b31fff3(de.slisson.mps.richtext.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
-    <import index="87nw" ref="r:ca2ab6bb-f6e7-4c0f-a88c-b78b9b31fff3(de.slisson.mps.richtext.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/com.mbeddr.formal.safety.stamp.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/com.mbeddr.formal.safety.stamp.mpl
index 6585d5ebb..6c91c115f 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/com.mbeddr.formal.safety.stamp.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/com.mbeddr.formal.safety.stamp.mpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language namespace="com.mbeddr.formal.safety.stamp" uuid="7e777b53-0a6b-4719-b36d-10475788d49f" languageVersion="2" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
@@ -14,19 +14,15 @@
   <dependencies>
     <dependency reexport="false">1144260c-e9a5-49a2-9add-39a1a1a7077e(de.itemis.mps.editor.diagram.runtime)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-    <dependency reexport="false">7e777b53-0a6b-4719-b36d-10475788d49f(com.mbeddr.formal.safety.stamp)</dependency>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
     <dependency reexport="false">17da266c-02d9-4bbd-b69b-8a656b49f45c(com.mbeddr.formal.safety.hara)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
-    <dependency reexport="false">8ca79d43-eb45-4791-bdd4-0d6130ff895b(de.itemis.mps.editor.diagram.layout)</dependency>
     <dependency reexport="false">e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
-    <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">6b84fb9e-5f09-4a61-bf31-3bfdc54820e3(com.mpsbasics.editor.utils)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="1" />
-    <language slang="l:8ca79d43-eb45-4791-bdd4-0d6130ff895b:de.itemis.mps.editor.diagram.layout" version="0" />
     <language slang="l:31c91def-a131-41a1-9018-102874f49a12:de.slisson.mps.editor.multiline" version="0" />
     <language slang="l:7e450f4e-1ac3-41ef-a851-4598161bdb94:de.slisson.mps.tables" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -88,7 +84,6 @@
     <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" />
@@ -104,7 +99,6 @@
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</extendedLanguage>
-    <extendedLanguage>83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</extendedLanguage>
   </extendedLanguages>
 </language>
 
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.constraints.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.constraints.mps
index 16f42b8c1..a7fb4a6c5 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.constraints.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.constraints.mps
@@ -14,7 +14,6 @@
     <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
   </languages>
   <imports>
-    <import index="35tq" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.scope(MPS.Core/)" />
     <import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
     <import index="bewr" ref="r:a5d87024-d7b0-459e-b0ec-a9c089196f41(com.mbeddr.formal.safety.stamp.structure)" />
   </imports>
@@ -128,9 +127,6 @@
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
-  <node concept="1M2fIO" id="1JhvKLLOidd">
-    <ref role="1M2myG" to="bewr:1JhvKLLO08a" resolve="UnsafeControlAnalysis" />
-  </node>
   <node concept="1M2fIO" id="1JhvKLLOifz">
     <property role="3GE5qa" value="baseLanguage.analysis" />
     <ref role="1M2myG" to="bewr:1JhvKLLO08w" resolve="UnsafeController" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.intentions.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.intentions.mps
index 222ae7d88..c6153c243 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.intentions.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.intentions.mps
@@ -8,7 +8,6 @@
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="ztk3" ref="r:1d7819a9-9001-45b3-8897-91b2f81186cb(com.mbeddr.formal.base.tooling.ui)" />
     <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" />
     <import index="bewr" ref="r:a5d87024-d7b0-459e-b0ec-a9c089196f41(com.mbeddr.formal.safety.stamp.structure)" />
     <import index="mryx" ref="r:da23d8da-3a75-4f33-96d8-7b3d3c2b2ccd(com.mpsbasics.editor.utils.screenshooter)" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.migration.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.migration.mps
index 2bfa43ef4..6b91df401 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.migration.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.migration.mps
@@ -3,18 +3,9 @@
   <persistence version="9" />
   <languages>
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="2" />
-    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
-    <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
     <devkit ref="2787ae0c-1f54-4fbf-b0b7-caf2b5beecbc(jetbrains.mps.devkit.aspect.migration)" />
   </languages>
-  <imports>
-    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
-    <import index="slm6" ref="90746344-04fd-4286-97d5-b46ae6a81709/r:52a3d974-bd4f-4651-ba6e-a2de5e336d95(jetbrains.mps.lang.migration/jetbrains.mps.lang.migration.methods)" />
-    <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
-    <import index="bewr" ref="r:a5d87024-d7b0-459e-b0ec-a9c089196f41(com.mbeddr.formal.safety.stamp.structure)" />
-  </imports>
+  <imports />
   <registry />
 </model>
 
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.plugin.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.plugin.mps
index cd70160be..2b192b8b5 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
@@ -7,15 +7,11 @@
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <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="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>
     <import index="nkm5" ref="r:095345ad-6627-42ca-9d3f-fc1b2d9fbd61(de.itemis.mps.editor.diagram.runtime.model)" />
-    <import index="fbzs" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.geom(JDK/)" />
-    <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
     <import index="bewr" ref="r:a5d87024-d7b0-459e-b0ec-a9c089196f41(com.mbeddr.formal.safety.stamp.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="90d" ref="r:421d64ed-8024-497f-aeab-8bddeb389dd2(jetbrains.mps.lang.extension.methods)" implicit="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.typesystem.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.typesystem.mps
index 751248a05..3b682fb27 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.typesystem.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.typesystem.mps
@@ -11,8 +11,6 @@
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="a6vc" ref="r:e6f4512f-409a-4a84-b8a1-33fc1cc8fd1f(com.mbeddr.formal.safety.stamp.behavior)" />
-    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
-    <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="tbr6" ref="r:6a005c26-87c0-43c4-8cf3-49ffba1099df(de.slisson.mps.richtext.behavior)" implicit="true" />
   </imports>
   <registry>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/com.fasten.assurance.build.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/com.fasten.assurance.build.msd
index 3dc815954..03dc4a7ce 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/com.fasten.assurance.build.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/com.fasten.assurance.build.msd
@@ -19,7 +19,6 @@
   <languageVersions>
     <language slang="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" version="0" />
     <language slang="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="7" />
-    <language slang="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
   </languageVersions>
   <dependencyVersions>
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 2495efe96..d5db9b880 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
@@ -5,7 +5,6 @@
   <languages>
     <use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="7" />
     <use id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build" version="0" />
-    <use id="3600cb0a-44dd-4a5b-9968-22924406419e" name="jetbrains.mps.build.mps.tests" version="1" />
   </languages>
   <imports>
     <import index="al5i" ref="r:742f344d-4dc4-4862-992c-4bc94b094870(com.mbeddr.mpsutil.dev.build)" />
@@ -1753,1941 +1752,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="v3CUrpJNFW" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNFX" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNFJ" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNFK" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNFL" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNFM" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNFN" role="2Ry0An">
-                      <property role="2Ry0Am" value="docx4j-core-11.4.9.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNGb" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNGc" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNFY" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNFZ" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNG0" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNG1" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNG2" role="2Ry0An">
-                      <property role="2Ry0Am" value="docx4j-JAXB-MOXy-11.4.9.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNGq" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNGr" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNGd" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNGe" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNGf" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNGg" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNGh" role="2Ry0An">
-                      <property role="2Ry0Am" value="docx4j-openxml-objects-11.4.9.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNGD" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNGE" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNGs" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNGt" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNGu" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNGv" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNGw" role="2Ry0An">
-                      <property role="2Ry0Am" value="docx4j-openxml-objects-pml-11.4.9.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNGS" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNGT" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNGF" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNGG" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNGH" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNGI" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNGJ" role="2Ry0An">
-                      <property role="2Ry0Am" value="docx4j-openxml-objects-sml-11.4.9.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNH9" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNHa" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNGU" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNGV" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNGW" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNGX" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNGY" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNGZ" role="2Ry0An">
-                        <property role="2Ry0Am" value="antlr-2.7.7.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNHq" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNHr" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNHb" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNHc" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNHd" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNHe" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNHf" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNHg" role="2Ry0An">
-                        <property role="2Ry0Am" value="antlr-runtime-3.5.2.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNHF" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNHG" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNHs" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNHt" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNHu" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNHv" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNHw" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNHx" role="2Ry0An">
-                        <property role="2Ry0Am" value="checker-qual-2.8.1.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNHW" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNHX" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNHH" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNHI" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNHJ" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNHK" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNHL" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNHM" role="2Ry0An">
-                        <property role="2Ry0Am" value="commons-codec-1.12.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNId" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNIe" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNHY" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNHZ" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNI0" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNI1" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNI2" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNI3" role="2Ry0An">
-                        <property role="2Ry0Am" value="commons-compress-1.21.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNIu" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNIv" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNIf" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNIg" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNIh" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNIi" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNIj" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNIk" role="2Ry0An">
-                        <property role="2Ry0Am" value="commons-io-2.7.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNIJ" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNIK" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNIw" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNIx" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNIy" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNIz" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNI$" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNI_" role="2Ry0An">
-                        <property role="2Ry0Am" value="commons-lang3-3.9.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNJ0" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNJ1" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNIL" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNIM" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNIN" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNIO" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNIP" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNIQ" role="2Ry0An">
-                        <property role="2Ry0Am" value="error_prone_annotations-2.3.3.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNJh" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNJi" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNJ2" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNJ3" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNJ4" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNJ5" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNJ6" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNJ7" role="2Ry0An">
-                        <property role="2Ry0Am" value="fontbox-2.0.24.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNJy" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNJz" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNJj" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNJk" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNJl" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNJm" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNJn" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNJo" role="2Ry0An">
-                        <property role="2Ry0Am" value="jakarta.activation-2.0.1.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNJN" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNJO" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNJ$" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNJ_" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNJA" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNJB" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNJC" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNJD" role="2Ry0An">
-                        <property role="2Ry0Am" value="jakarta.mail-2.0.1.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNK4" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNK5" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNJP" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNJQ" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNJR" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNJS" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNJT" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNJU" role="2Ry0An">
-                        <property role="2Ry0Am" value="jakarta.xml.bind-api-3.0.1.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNKl" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNKm" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNK6" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNK7" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNK8" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNK9" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNKa" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNKb" role="2Ry0An">
-                        <property role="2Ry0Am" value="jaxb-svg11-11.4.0.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNKA" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNKB" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNKn" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNKo" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNKp" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNKq" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNKr" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNKs" role="2Ry0An">
-                        <property role="2Ry0Am" value="jcl-over-slf4j-2.0.0-alpha5.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNKR" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNKS" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNKC" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNKD" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNKE" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNKF" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNKG" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNKH" role="2Ry0An">
-                        <property role="2Ry0Am" value="mbassador-1.3.2.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNL8" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNL9" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNKT" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNKU" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNKV" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNKW" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNKX" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNKY" role="2Ry0An">
-                        <property role="2Ry0Am" value="org.eclipse.persistence.asm-9.1.0.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNLp" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNLq" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNLa" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNLb" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNLc" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNLd" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNLe" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNLf" role="2Ry0An">
-                        <property role="2Ry0Am" value="org.eclipse.persistence.core-3.0.2.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNLE" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNLF" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNLr" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNLs" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNLt" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNLu" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNLv" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNLw" role="2Ry0An">
-                        <property role="2Ry0Am" value="org.eclipse.persistence.moxy-3.0.2.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNLV" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNLW" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNLG" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNLH" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNLI" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNLJ" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNLK" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNLL" role="2Ry0An">
-                        <property role="2Ry0Am" value="qdox-1.12.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNMc" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNMd" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNLX" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNLY" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNLZ" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNM0" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNM1" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNM2" role="2Ry0An">
-                        <property role="2Ry0Am" value="slf4j-api-2.0.0-alpha6.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNMt" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNMu" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNMe" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNMf" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNMg" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNMh" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNMi" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNMj" role="2Ry0An">
-                        <property role="2Ry0Am" value="stringtemplate-3.2.1.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNMI" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNMJ" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNMv" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNMw" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNMx" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNMy" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNMz" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNM$" role="2Ry0An">
-                        <property role="2Ry0Am" value="wmf2svg-0.9.8.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNMZ" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNN0" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNMK" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNML" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNMM" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNMN" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNMO" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNMP" role="2Ry0An">
-                        <property role="2Ry0Am" value="xalan-interpretive-11.0.0.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNNg" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNNh" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNN1" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNN2" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNN3" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNN4" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNN5" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNN6" role="2Ry0An">
-                        <property role="2Ry0Am" value="xalan-serializer-11.0.0.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNNx" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNNy" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNNi" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNNj" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNNk" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNNl" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNNm" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNNn" role="2Ry0An">
-                        <property role="2Ry0Am" value="xmlgraphics-commons-2.7.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNNK" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNNL" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNNz" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNN$" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNN_" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNNA" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNNB" role="2Ry0An">
-                      <property role="2Ry0Am" value="docx4j-core-11.4.9.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNNZ" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNO0" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNNM" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNNN" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNNO" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNNP" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNNQ" role="2Ry0An">
-                      <property role="2Ry0Am" value="docx4j-JAXB-MOXy-11.4.9.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNOe" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNOf" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNO1" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNO2" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNO3" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNO4" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNO5" role="2Ry0An">
-                      <property role="2Ry0Am" value="docx4j-openxml-objects-11.4.9.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNOt" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNOu" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNOg" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNOh" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNOi" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNOj" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNOk" role="2Ry0An">
-                      <property role="2Ry0Am" value="docx4j-openxml-objects-pml-11.4.9.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNOG" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNOH" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNOv" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNOw" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNOx" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNOy" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNOz" role="2Ry0An">
-                      <property role="2Ry0Am" value="docx4j-openxml-objects-sml-11.4.9.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNOX" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNOY" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNOI" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNOJ" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNOK" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNOL" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNOM" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNON" role="2Ry0An">
-                        <property role="2Ry0Am" value="antlr-2.7.7.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNPe" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNPf" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNOZ" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNP0" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNP1" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNP2" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNP3" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNP4" role="2Ry0An">
-                        <property role="2Ry0Am" value="antlr-runtime-3.5.2.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNPv" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNPw" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNPg" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNPh" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNPi" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNPj" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNPk" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNPl" role="2Ry0An">
-                        <property role="2Ry0Am" value="checker-qual-2.8.1.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNPK" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNPL" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNPx" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNPy" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNPz" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNP$" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNP_" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNPA" role="2Ry0An">
-                        <property role="2Ry0Am" value="commons-codec-1.12.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNQ1" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNQ2" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNPM" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNPN" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNPO" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNPP" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNPQ" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNPR" role="2Ry0An">
-                        <property role="2Ry0Am" value="commons-compress-1.21.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNQi" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNQj" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNQ3" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNQ4" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNQ5" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNQ6" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNQ7" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNQ8" role="2Ry0An">
-                        <property role="2Ry0Am" value="commons-io-2.7.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNQz" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNQ$" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNQk" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNQl" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNQm" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNQn" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNQo" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNQp" role="2Ry0An">
-                        <property role="2Ry0Am" value="commons-lang3-3.9.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNQO" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNQP" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNQ_" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNQA" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNQB" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNQC" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNQD" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNQE" role="2Ry0An">
-                        <property role="2Ry0Am" value="error_prone_annotations-2.3.3.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNR5" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNR6" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNQQ" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNQR" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNQS" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNQT" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNQU" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNQV" role="2Ry0An">
-                        <property role="2Ry0Am" value="fontbox-2.0.24.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNRm" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNRn" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNR7" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNR8" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNR9" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNRa" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNRb" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNRc" role="2Ry0An">
-                        <property role="2Ry0Am" value="jakarta.activation-2.0.1.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNRB" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNRC" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNRo" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNRp" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNRq" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNRr" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNRs" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNRt" role="2Ry0An">
-                        <property role="2Ry0Am" value="jakarta.mail-2.0.1.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNRS" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNRT" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNRD" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNRE" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNRF" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNRG" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNRH" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNRI" role="2Ry0An">
-                        <property role="2Ry0Am" value="jakarta.xml.bind-api-3.0.1.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNS9" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNSa" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNRU" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNRV" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNRW" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNRX" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNRY" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNRZ" role="2Ry0An">
-                        <property role="2Ry0Am" value="jaxb-svg11-11.4.0.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNSq" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNSr" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNSb" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNSc" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNSd" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNSe" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNSf" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNSg" role="2Ry0An">
-                        <property role="2Ry0Am" value="jcl-over-slf4j-2.0.0-alpha5.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNSF" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNSG" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNSs" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNSt" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNSu" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNSv" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNSw" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNSx" role="2Ry0An">
-                        <property role="2Ry0Am" value="mbassador-1.3.2.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNSW" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNSX" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNSH" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNSI" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNSJ" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNSK" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNSL" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNSM" role="2Ry0An">
-                        <property role="2Ry0Am" value="org.eclipse.persistence.asm-9.1.0.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNTd" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNTe" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNSY" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNSZ" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNT0" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNT1" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNT2" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNT3" role="2Ry0An">
-                        <property role="2Ry0Am" value="org.eclipse.persistence.core-3.0.2.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNTu" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNTv" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNTf" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNTg" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNTh" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNTi" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNTj" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNTk" role="2Ry0An">
-                        <property role="2Ry0Am" value="org.eclipse.persistence.moxy-3.0.2.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNTJ" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNTK" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNTw" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNTx" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNTy" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNTz" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNT$" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNT_" role="2Ry0An">
-                        <property role="2Ry0Am" value="qdox-1.12.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNU0" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNU1" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNTL" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNTM" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNTN" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNTO" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNTP" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNTQ" role="2Ry0An">
-                        <property role="2Ry0Am" value="slf4j-api-2.0.0-alpha6.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNUh" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNUi" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNU2" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNU3" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNU4" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNU5" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNU6" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNU7" role="2Ry0An">
-                        <property role="2Ry0Am" value="stringtemplate-3.2.1.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNUy" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNUz" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNUj" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNUk" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNUl" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNUm" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNUn" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNUo" role="2Ry0An">
-                        <property role="2Ry0Am" value="wmf2svg-0.9.8.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNUN" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNUO" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNU$" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNU_" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNUA" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNUB" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNUC" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNUD" role="2Ry0An">
-                        <property role="2Ry0Am" value="xalan-interpretive-11.0.0.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNV4" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNV5" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNUP" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNUQ" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNUR" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNUS" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNUT" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNUU" role="2Ry0An">
-                        <property role="2Ry0Am" value="xalan-serializer-11.0.0.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNVl" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNVm" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNV6" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNV7" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNV8" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNV9" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNVa" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNVb" role="2Ry0An">
-                        <property role="2Ry0Am" value="xmlgraphics-commons-2.7.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNV$" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNV_" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNVn" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNVo" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNVp" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNVq" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNVr" role="2Ry0An">
-                      <property role="2Ry0Am" value="docx4j-core-11.4.9.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNVN" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNVO" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNVA" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNVB" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNVC" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNVD" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNVE" role="2Ry0An">
-                      <property role="2Ry0Am" value="docx4j-JAXB-MOXy-11.4.9.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNW2" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNW3" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNVP" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNVQ" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNVR" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNVS" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNVT" role="2Ry0An">
-                      <property role="2Ry0Am" value="docx4j-openxml-objects-11.4.9.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNWh" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNWi" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNW4" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNW5" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNW6" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNW7" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNW8" role="2Ry0An">
-                      <property role="2Ry0Am" value="docx4j-openxml-objects-pml-11.4.9.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNWw" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNWx" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNWj" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNWk" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNWl" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNWm" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNWn" role="2Ry0An">
-                      <property role="2Ry0Am" value="docx4j-openxml-objects-sml-11.4.9.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNWL" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNWM" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNWy" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNWz" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNW$" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNW_" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNWA" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNWB" role="2Ry0An">
-                        <property role="2Ry0Am" value="antlr-2.7.7.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNX2" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNX3" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNWN" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNWO" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNWP" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNWQ" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNWR" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNWS" role="2Ry0An">
-                        <property role="2Ry0Am" value="antlr-runtime-3.5.2.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNXj" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNXk" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNX4" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNX5" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNX6" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNX7" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNX8" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNX9" role="2Ry0An">
-                        <property role="2Ry0Am" value="checker-qual-2.8.1.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNX$" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNX_" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNXl" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNXm" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNXn" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNXo" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNXp" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNXq" role="2Ry0An">
-                        <property role="2Ry0Am" value="commons-codec-1.12.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNXP" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNXQ" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNXA" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNXB" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNXC" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNXD" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNXE" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNXF" role="2Ry0An">
-                        <property role="2Ry0Am" value="commons-compress-1.21.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNY6" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNY7" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNXR" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNXS" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNXT" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNXU" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNXV" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNXW" role="2Ry0An">
-                        <property role="2Ry0Am" value="commons-io-2.7.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNYn" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNYo" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNY8" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNY9" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNYa" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNYb" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNYc" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNYd" role="2Ry0An">
-                        <property role="2Ry0Am" value="commons-lang3-3.9.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNYC" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNYD" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNYp" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNYq" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNYr" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNYs" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNYt" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNYu" role="2Ry0An">
-                        <property role="2Ry0Am" value="error_prone_annotations-2.3.3.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNYT" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNYU" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNYE" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNYF" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNYG" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNYH" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNYI" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNYJ" role="2Ry0An">
-                        <property role="2Ry0Am" value="fontbox-2.0.24.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNZa" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNZb" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNYV" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNYW" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNYX" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNYY" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNYZ" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNZ0" role="2Ry0An">
-                        <property role="2Ry0Am" value="jakarta.activation-2.0.1.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNZr" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNZs" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNZc" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNZd" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNZe" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNZf" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNZg" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNZh" role="2Ry0An">
-                        <property role="2Ry0Am" value="jakarta.mail-2.0.1.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNZG" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNZH" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNZt" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNZu" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNZv" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNZw" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNZx" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNZy" role="2Ry0An">
-                        <property role="2Ry0Am" value="jakarta.xml.bind-api-3.0.1.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJNZX" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJNZY" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNZI" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJNZJ" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJNZK" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJNZL" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJNZM" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJNZN" role="2Ry0An">
-                        <property role="2Ry0Am" value="jaxb-svg11-11.4.0.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJO0e" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJO0f" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJNZZ" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJO00" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJO01" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJO02" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJO03" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJO04" role="2Ry0An">
-                        <property role="2Ry0Am" value="jcl-over-slf4j-2.0.0-alpha5.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJO0v" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJO0w" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJO0g" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJO0h" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJO0i" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJO0j" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJO0k" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJO0l" role="2Ry0An">
-                        <property role="2Ry0Am" value="mbassador-1.3.2.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJO0K" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJO0L" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJO0x" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJO0y" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJO0z" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJO0$" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJO0_" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJO0A" role="2Ry0An">
-                        <property role="2Ry0Am" value="org.eclipse.persistence.asm-9.1.0.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJO11" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJO12" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJO0M" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJO0N" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJO0O" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJO0P" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJO0Q" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJO0R" role="2Ry0An">
-                        <property role="2Ry0Am" value="org.eclipse.persistence.core-3.0.2.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJO1i" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJO1j" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJO13" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJO14" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJO15" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJO16" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJO17" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJO18" role="2Ry0An">
-                        <property role="2Ry0Am" value="org.eclipse.persistence.moxy-3.0.2.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJO1z" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJO1$" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJO1k" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJO1l" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJO1m" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJO1n" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJO1o" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJO1p" role="2Ry0An">
-                        <property role="2Ry0Am" value="qdox-1.12.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJO1O" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJO1P" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJO1_" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJO1A" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJO1B" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJO1C" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJO1D" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJO1E" role="2Ry0An">
-                        <property role="2Ry0Am" value="slf4j-api-2.0.0-alpha6.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJO25" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJO26" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJO1Q" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJO1R" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJO1S" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJO1T" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJO1U" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJO1V" role="2Ry0An">
-                        <property role="2Ry0Am" value="stringtemplate-3.2.1.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJO2m" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJO2n" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJO27" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJO28" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJO29" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJO2a" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJO2b" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJO2c" role="2Ry0An">
-                        <property role="2Ry0Am" value="wmf2svg-0.9.8.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJO2B" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJO2C" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJO2o" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJO2p" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJO2q" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJO2r" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJO2s" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJO2t" role="2Ry0An">
-                        <property role="2Ry0Am" value="xalan-interpretive-11.0.0.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJO2S" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJO2T" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJO2D" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJO2E" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJO2F" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJO2G" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJO2H" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJO2I" role="2Ry0An">
-                        <property role="2Ry0Am" value="xalan-serializer-11.0.0.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="v3CUrpJO39" role="3bR37C">
-          <node concept="1BurEX" id="v3CUrpJO3a" role="1SiIV1">
-            <node concept="398BVA" id="v3CUrpJO2U" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="v3CUrpJO2V" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="v3CUrpJO2W" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="v3CUrpJO2X" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="v3CUrpJO2Y" role="2Ry0An">
-                      <property role="2Ry0Am" value="dependencies" />
-                      <node concept="2Ry0Ak" id="v3CUrpJO2Z" role="2Ry0An">
-                        <property role="2Ry0Am" value="xmlgraphics-commons-2.7.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
       </node>
       <node concept="1E1JtA" id="6hyv0iVPlFJ" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -6150,40 +4214,6 @@
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
           </node>
         </node>
-        <node concept="1SiIV0" id="5t37uj6UFbd" role="3bR37C">
-          <node concept="3bR9La" id="5t37uj6UFbe" role="1SiIV1">
-            <ref role="3bR37D" node="6hyv0iVPlG3" resolve="com.mbeddr.formal.base" />
-          </node>
-        </node>
-        <node concept="1yeLz9" id="5t37uj6UFbx" role="1TViLv">
-          <property role="TrG5h" value="com.fasten.process.review.generator" />
-          <property role="3LESm3" value="422f456d-00c1-43e1-afde-92df55d9ffca" />
-          <node concept="1BupzO" id="5t37uj6UFbJ" role="3bR31x">
-            <property role="3ZfqAx" value="generator/templates" />
-            <property role="1Hdu6h" value="true" />
-            <property role="1HemKv" value="true" />
-            <node concept="3LXTmp" id="5t37uj6UFbK" role="1HemKq">
-              <node concept="398BVA" id="5t37uj6UFby" role="3LXTmr">
-                <ref role="398BVh" node="6hyv0iVPlDX" resolve="mbeddr.formal.safety.code" />
-                <node concept="2Ry0Ak" id="5t37uj6UFbz" role="iGT6I">
-                  <property role="2Ry0Am" value="languages" />
-                  <node concept="2Ry0Ak" id="5t37uj6UFb$" role="2Ry0An">
-                    <property role="2Ry0Am" value="com.fasten.process.review" />
-                    <node concept="2Ry0Ak" id="5t37uj6UFb_" role="2Ry0An">
-                      <property role="2Ry0Am" value="generator" />
-                      <node concept="2Ry0Ak" id="5t37uj6UFbA" role="2Ry0An">
-                        <property role="2Ry0Am" value="templates" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3qWCbU" id="5t37uj6UFbL" role="3LXTna">
-                <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3rtmxn" id="5t37uj6UF_8" role="3bR31x">
           <node concept="3LXTmp" id="5t37uj6UF_9" role="3rtmxm">
             <node concept="398BVA" id="5t37uj6UF_a" role="3LXTmr">
@@ -6227,6 +4257,11 @@
             <ref role="3bR37D" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
           </node>
         </node>
+        <node concept="1SiIV0" id="1a4oUCpP2V$" role="3bR37C">
+          <node concept="1Busua" id="1a4oUCpP2V_" role="1SiIV1">
+            <ref role="1Busuk" node="6hyv0iVPlG3" resolve="com.mbeddr.formal.base" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="5FTX57fE1T2" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -6313,6 +4348,76 @@
           </node>
         </node>
       </node>
+      <node concept="1E1JtD" id="6Z2HiVHt7eY" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="com.fasten.safety.bayesian_network" />
+        <property role="3LESm3" value="14289527-ae82-48f0-ab60-380cec6ac506" />
+        <node concept="398BVA" id="6Z2HiVHt7M7" role="3LF7KH">
+          <ref role="398BVh" node="6hyv0iVPlDX" resolve="mbeddr.formal.safety.code" />
+          <node concept="2Ry0Ak" id="6Z2HiVHt8dy" role="iGT6I">
+            <property role="2Ry0Am" value="languages" />
+            <node concept="2Ry0Ak" id="6Z2HiVHt8vP" role="2Ry0An">
+              <property role="2Ry0Am" value="com.fasten.safety.bayesian_network" />
+              <node concept="2Ry0Ak" id="6Z2HiVHt8M8" role="2Ry0An">
+                <property role="2Ry0Am" value="com.fasten.safety.bayesian_network.mpl" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="6Z2HiVHt9sZ" role="3bR37C">
+          <node concept="3bR9La" id="6Z2HiVHt9t0" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="6Z2HiVHt9t1" role="3bR37C">
+          <node concept="3bR9La" id="6Z2HiVHt9t2" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="6Z2HiVHt9t5" role="3bR37C">
+          <node concept="3bR9La" id="6Z2HiVHt9t6" role="1SiIV1">
+            <ref role="3bR37D" node="6hyv0iVPlG3" resolve="com.mbeddr.formal.base" />
+          </node>
+        </node>
+        <node concept="1BupzO" id="6Z2HiVHt9ti" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="6Z2HiVHt9tj" role="1HemKq">
+            <node concept="398BVA" id="6Z2HiVHt9t7" role="3LXTmr">
+              <ref role="398BVh" node="6hyv0iVPlDX" resolve="mbeddr.formal.safety.code" />
+              <node concept="2Ry0Ak" id="6Z2HiVHt9t8" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="6Z2HiVHt9t9" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.fasten.safety.bayesian_network" />
+                  <node concept="2Ry0Ak" id="6Z2HiVHt9ta" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="6Z2HiVHt9tk" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
+        <node concept="3rtmxn" id="6Z2HiVHt9BK" role="3bR31x">
+          <node concept="3LXTmp" id="6Z2HiVHt9BL" role="3rtmxm">
+            <node concept="398BVA" id="6Z2HiVHt9BM" role="3LXTmr">
+              <ref role="398BVh" node="6hyv0iVPlDX" resolve="mbeddr.formal.safety.code" />
+              <node concept="2Ry0Ak" id="6Z2HiVHt9BN" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="6Z2HiVHt9BO" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.fasten.safety.bayesian_network" />
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="6Z2HiVHt9BQ" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2G$12M" id="6hyv0iVPlEj" role="3989C9">
       <property role="TrG5h" value="fasten.assurance" />
@@ -6371,11 +4476,6 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
           </node>
         </node>
-        <node concept="1SiIV0" id="6hyv0iVPlQD" role="3bR37C">
-          <node concept="3bR9La" id="6hyv0iVPm3D" role="1SiIV1">
-            <ref role="3bR37D" node="6hyv0iVPlGt" resolve="com.mbeddr.formal.safety.gsn" />
-          </node>
-        </node>
         <node concept="1BupzO" id="6hyv0iVPlQE" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -6454,11 +4554,6 @@
             <ref role="3bR37D" node="2u7UHDCnRuK" resolve="com.mpsbasics.editor.utils" />
           </node>
         </node>
-        <node concept="1SiIV0" id="6TSnICNBTGc" role="3bR37C">
-          <node concept="3bR9La" id="6TSnICNBTGd" role="1SiIV1">
-            <ref role="3bR37D" to="90a9:4be$WTb1CbJ" resolve="de.itemis.mps.editor.diagram" />
-          </node>
-        </node>
       </node>
       <node concept="1E1JtD" id="6hyv0iVPlGu" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -6635,11 +4730,6 @@
             <ref role="1Busuk" node="6hyv0iVPlGt" resolve="com.mbeddr.formal.safety.gsn" />
           </node>
         </node>
-        <node concept="1SiIV0" id="6hyv0iVPlR5" role="3bR37C">
-          <node concept="3bR9La" id="6hyv0iVPm45" role="1SiIV1">
-            <ref role="3bR37D" node="6hyv0iVPlGv" resolve="com.mbeddr.formal.safety.gsn.ext" />
-          </node>
-        </node>
         <node concept="1BupzO" id="6hyv0iVPlR7" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -6677,11 +4767,6 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="56pBK14yoWB" role="3bR37C">
-          <node concept="3bR9La" id="56pBK14yoWC" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6LaO" resolve="jetbrains.mps.lang.structure" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="4bL3rTRDsus" role="3bR37C">
           <node concept="3bR9La" id="4bL3rTRDsut" role="1SiIV1">
             <ref role="3bR37D" node="6hyv0iVPlG3" resolve="com.mbeddr.formal.base" />
@@ -7025,11 +5110,6 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6LfQ" resolve="jetbrains.mps.kernel" />
           </node>
         </node>
-        <node concept="1SiIV0" id="8xY_IhvzKr" role="3bR37C">
-          <node concept="3bR9La" id="8xY_IhvzKs" role="1SiIV1">
-            <ref role="3bR37D" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
-          </node>
-        </node>
       </node>
       <node concept="1E1JtD" id="5YWtEMPIdDz" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -7203,11 +5283,6 @@
             <ref role="3bR37D" node="6hyv0iVPlG3" resolve="com.mbeddr.formal.base" />
           </node>
         </node>
-        <node concept="1SiIV0" id="5TwIvQFIvYE" role="3bR37C">
-          <node concept="3bR9La" id="5TwIvQFIvYF" role="1SiIV1">
-            <ref role="3bR37D" node="6hyv0iVPlGc" resolve="com.mbeddr.formal.base.tooling" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="5TwIvQFIvYG" role="3bR37C">
           <node concept="3bR9La" id="5TwIvQFIvYH" role="1SiIV1">
             <ref role="3bR37D" node="6hyv0iVPlGt" resolve="com.mbeddr.formal.safety.gsn" />
@@ -7218,11 +5293,6 @@
             <ref role="1Busuk" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
           </node>
         </node>
-        <node concept="1SiIV0" id="2u7UHDCnSSE" role="3bR37C">
-          <node concept="3bR9La" id="2u7UHDCnSSF" role="1SiIV1">
-            <ref role="3bR37D" node="2u7UHDCnPLY" resolve="com.mpsbasics.project.utils" />
-          </node>
-        </node>
       </node>
       <node concept="1E1JtD" id="4eD_5l3aLAv" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -7477,11 +5547,6 @@
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
           </node>
         </node>
-        <node concept="1SiIV0" id="y1G8y6eYHj" role="3bR37C">
-          <node concept="3bR9La" id="y1G8y6eYHk" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="y1G8y6eYHl" role="3bR37C">
           <node concept="3bR9La" id="y1G8y6eYHm" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
@@ -7535,11 +5600,6 @@
               <ref role="3bR37D" node="6hyv0iVPlGt" resolve="com.mbeddr.formal.safety.gsn" />
             </node>
           </node>
-          <node concept="1SiIV0" id="y1G8y6eYHN" role="3bR37C">
-            <node concept="3bR9La" id="y1G8y6eYHO" role="1SiIV1">
-              <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
-            </node>
-          </node>
           <node concept="1BupzO" id="y1G8y6eYI2" role="3bR31x">
             <property role="3ZfqAx" value="generator/templates" />
             <property role="1Hdu6h" value="true" />
@@ -7565,11 +5625,6 @@
               </node>
             </node>
           </node>
-          <node concept="1SiIV0" id="2u7UHDCnST_" role="3bR37C">
-            <node concept="3bR9La" id="2u7UHDCnSTA" role="1SiIV1">
-              <ref role="3bR37D" node="2u7UHDCnPLY" resolve="com.mpsbasics.project.utils" />
-            </node>
-          </node>
         </node>
         <node concept="3rtmxn" id="y1G8y6eYTf" role="3bR31x">
           <node concept="3LXTmp" id="y1G8y6eYTg" role="3rtmxm">
@@ -7587,11 +5642,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="4jiM8XSx7SC" role="3bR37C">
-          <node concept="Rbm2T" id="4jiM8XSx7SD" role="1SiIV1">
-            <ref role="1E1Vl2" to="ffeo:7Kfy9QB6L9O" resolve="jetbrains.mps.lang.smodel" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="8xY_IhvzLY" role="3bR37C">
           <node concept="1Busua" id="8xY_IhvzLZ" role="1SiIV1">
             <ref role="1Busuk" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
@@ -7600,6 +5650,11 @@
         <node concept="1E0d5M" id="1hVhF3lqvV3" role="1E1XAP">
           <ref role="1E0d5P" node="2u7UHDCnPLY" resolve="com.mpsbasics.project.utils" />
         </node>
+        <node concept="1SiIV0" id="1a4oUCq3Az$" role="3bR37C">
+          <node concept="Rbm2T" id="1a4oUCq3Az_" role="1SiIV1">
+            <ref role="1E1Vl2" to="ffeo:7Kfy9QB6L9O" resolve="jetbrains.mps.lang.smodel" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="6VBHnHRiYOJ" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -7796,11 +5851,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="y1G8y6f0r9" role="3bR37C">
-          <node concept="3bR9La" id="y1G8y6f0ra" role="1SiIV1">
-            <ref role="3bR37D" node="y1G8y6eYHI" resolve="com.mbeddr.formal.safety.argument.modelquery.generator" />
-          </node>
-        </node>
         <node concept="1BupzO" id="y1G8y6f0rm" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -8018,11 +6068,6 @@
             <ref role="3bR37D" node="4SCnVTcAZiY" resolve="com.mbeddr.formal.safety.gsn.doc" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7YjSMFl$dyq" role="3bR37C">
-          <node concept="3bR9La" id="7YjSMFl$dyr" role="1SiIV1">
-            <ref role="3bR37D" node="6hyv0iVPlGc" resolve="com.mbeddr.formal.base.tooling" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="8xY_IhvzMX" role="3bR37C">
           <node concept="3bR9La" id="8xY_IhvzMY" role="1SiIV1">
             <ref role="3bR37D" to="al5i:$bJ0jguQfr" resolve="com.mbeddr.core.base" />
@@ -8160,11 +6205,6 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
           </node>
         </node>
-        <node concept="1SiIV0" id="jPgKPEIjIq" role="3bR37C">
-          <node concept="3bR9La" id="jPgKPEIjIr" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="jPgKPEIjIs" role="3bR37C">
           <node concept="3bR9La" id="jPgKPEIjIt" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
@@ -8427,11 +6467,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="6i5G5_YU2Eb" role="3bR37C">
-          <node concept="3bR9La" id="6i5G5_YU2Ec" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="6i5G5_YU2Ed" role="3bR37C">
           <node concept="3bR9La" id="6i5G5_YU2Ee" role="1SiIV1">
             <ref role="3bR37D" node="6hyv0iVPlGt" resolve="com.mbeddr.formal.safety.gsn" />
@@ -8442,11 +6477,6 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
           </node>
         </node>
-        <node concept="1SiIV0" id="6i5G5_YU2Eh" role="3bR37C">
-          <node concept="3bR9La" id="6i5G5_YU2Ei" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="6i5G5_YU2Ej" role="3bR37C">
           <node concept="3bR9La" id="6i5G5_YU2Ek" role="1SiIV1">
             <ref role="3bR37D" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
@@ -8537,16 +6567,6 @@
             <ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
           </node>
         </node>
-        <node concept="1SiIV0" id="6i5G5_YU5L8" role="3bR37C">
-          <node concept="3bR9La" id="6i5G5_YU5L9" role="1SiIV1">
-            <ref role="3bR37D" node="6hyv0iVPlGt" resolve="com.mbeddr.formal.safety.gsn" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="6i5G5_YU5La" role="3bR37C">
-          <node concept="3bR9La" id="6i5G5_YU5Lb" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="6i5G5_YU5Lc" role="3bR37C">
           <node concept="3bR9La" id="6i5G5_YU5Ld" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
@@ -8557,11 +6577,6 @@
             <ref role="3bR37D" to="90a9:PE3B26QCrP" resolve="org.apache.commons" />
           </node>
         </node>
-        <node concept="1SiIV0" id="6i5G5_YU5Lg" role="3bR37C">
-          <node concept="3bR9La" id="6i5G5_YU5Lh" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="6i5G5_YU5Li" role="3bR37C">
           <node concept="3bR9La" id="6i5G5_YU5Lj" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:2eDSGe9d1qi" resolve="jetbrains.mps.ide" />
@@ -8650,35 +6665,6 @@
             <ref role="1Busuk" node="6hyv0iVPlFM" resolve="com.mbeddr.formal.req.base" />
           </node>
         </node>
-        <node concept="1yeLz9" id="6hyv0iVPlRu" role="1TViLv">
-          <property role="TrG5h" value="com.mbeddr.formal.safety.req#01" />
-          <property role="3LESm3" value="40737904-e87f-4008-8d74-4d30b5b852db" />
-          <node concept="1BupzO" id="6hyv0iVPm4u" role="3bR31x">
-            <property role="3ZfqAx" value="generator/template" />
-            <property role="1Hdu6h" value="true" />
-            <property role="1HemKv" value="true" />
-            <node concept="3LXTmp" id="6hyv0iVPmcH" role="1HemKq">
-              <node concept="398BVA" id="6hyv0iVPmhX" role="3LXTmr">
-                <ref role="398BVh" node="6hyv0iVPlDX" resolve="mbeddr.formal.safety.code" />
-                <node concept="2Ry0Ak" id="6hyv0iVPmlw" role="iGT6I">
-                  <property role="2Ry0Am" value="languages" />
-                  <node concept="2Ry0Ak" id="6hyv0iVPmom" role="2Ry0An">
-                    <property role="2Ry0Am" value="com.mbeddr.formal.safety.req" />
-                    <node concept="2Ry0Ak" id="6hyv0iVPmpO" role="2Ry0An">
-                      <property role="2Ry0Am" value="generator" />
-                      <node concept="2Ry0Ak" id="6hyv0iVPmqr" role="2Ry0An">
-                        <property role="2Ry0Am" value="template" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3qWCbU" id="6hyv0iVPmhY" role="3LXTna">
-                <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="1BupzO" id="6hyv0iVPlRv" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -8701,11 +6687,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="6hyv0iVPlRw" role="3bR37C">
-          <node concept="3bR9La" id="6hyv0iVPm4w" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
-          </node>
-        </node>
         <node concept="3rtmxn" id="6hyv0iVPlRx" role="3bR31x">
           <node concept="3LXTmp" id="6hyv0iVPm4x" role="3rtmxm">
             <node concept="3qWCbU" id="6hyv0iVPmcK" role="3LXTna">
@@ -8790,11 +6771,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="6hyv0iVPlSe" role="3bR37C">
-          <node concept="3bR9La" id="6hyv0iVPm5n" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6LfQ" resolve="jetbrains.mps.kernel" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="8xY_IhvzNL" role="3bR37C">
           <node concept="1Busua" id="8xY_IhvzNM" role="1SiIV1">
             <ref role="1Busuk" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
@@ -8833,11 +6809,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="6hyv0iVPlSj" role="3bR37C">
-          <node concept="3bR9La" id="6hyv0iVPm5s" role="1SiIV1">
-            <ref role="3bR37D" node="6hyv0iVPlG5" resolve="com.mbeddr.formal.base.expressions" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="6hyv0iVPlSk" role="3bR37C">
           <node concept="3bR9La" id="6hyv0iVPm5t" role="1SiIV1">
             <ref role="3bR37D" node="6hyv0iVPlG$" resolve="com.mbeddr.formal.safety.hara" />
@@ -8870,11 +6841,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="6ucyvMUxOqh" role="3bR37C">
-          <node concept="3bR9La" id="6ucyvMUxOqi" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="6ucyvMUxOqj" role="3bR37C">
           <node concept="3bR9La" id="6ucyvMUxOqk" role="1SiIV1">
             <ref role="3bR37D" node="6hyv0iVPlG3" resolve="com.mbeddr.formal.base" />
@@ -8950,11 +6916,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="8xY_IhvzNY" role="3bR37C">
-          <node concept="3bR9La" id="8xY_IhvzNZ" role="1SiIV1">
-            <ref role="3bR37D" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
-          </node>
-        </node>
       </node>
       <node concept="1E1JtD" id="6hyv0iVPlGA" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -9006,11 +6967,6 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6LfQ" resolve="jetbrains.mps.kernel" />
           </node>
         </node>
-        <node concept="1SiIV0" id="6hyv0iVPlSu" role="3bR37C">
-          <node concept="3bR9La" id="6hyv0iVPm5B" role="1SiIV1">
-            <ref role="3bR37D" node="6hyv0iVPlGA" resolve="com.mbeddr.formal.safety.stamp" />
-          </node>
-        </node>
         <node concept="1BupzO" id="6hyv0iVPlSv" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -9048,26 +7004,11 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
           </node>
         </node>
-        <node concept="1SiIV0" id="6hyv0iVPlS_" role="3bR37C">
-          <node concept="1Busua" id="6hyv0iVPm5I" role="1SiIV1">
-            <ref role="1Busuk" node="6hyv0iVPlG3" resolve="com.mbeddr.formal.base" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="1FMyjUPaAIF" role="3bR37C">
-          <node concept="3bR9La" id="1FMyjUPaAIG" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="8xY_IhvzOb" role="3bR37C">
           <node concept="3bR9La" id="8xY_IhvzOc" role="1SiIV1">
             <ref role="3bR37D" to="90a9:4be$WTb1AQa" resolve="de.itemis.mps.editor.diagram.runtime" />
           </node>
         </node>
-        <node concept="1SiIV0" id="8xY_IhvzOd" role="3bR37C">
-          <node concept="3bR9La" id="8xY_IhvzOe" role="1SiIV1">
-            <ref role="3bR37D" to="90a9:56Tfdun3uan" resolve="de.itemis.mps.editor.diagram.layout" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="8xY_IhvzOq" role="3bR37C">
           <node concept="1Busua" id="8xY_IhvzOr" role="1SiIV1">
             <ref role="1Busuk" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
@@ -9249,11 +7190,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="8xY_IhvzOB" role="3bR37C">
-          <node concept="3bR9La" id="8xY_IhvzOC" role="1SiIV1">
-            <ref role="3bR37D" to="90a9:4frYVBf39$o" resolve="de.itemis.mps.editor.diagram.styles" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="8xY_IhvzOD" role="3bR37C">
           <node concept="3bR9La" id="8xY_IhvzOE" role="1SiIV1">
             <ref role="3bR37D" to="90a9:2jlBy7bQtz0" resolve="com.mbeddr.mpsutil.treenotation.styles" />
@@ -9383,11 +7319,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="8xY_IhvzOU" role="3bR37C">
-          <node concept="3bR9La" id="8xY_IhvzOV" role="1SiIV1">
-            <ref role="3bR37D" to="90a9:2NTGYE$JTGY" resolve="com.dslfoundry.plaintextgen" />
-          </node>
-        </node>
       </node>
       <node concept="1E1JtA" id="3rkUgzovdWl" role="2G$12L">
         <property role="BnDLt" value="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.process.review.sandbox/models/com.fasten.process.review.sandbox.argument.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.process.review.sandbox/models/com.fasten.process.review.sandbox.argument.mps
index f43db8c3c..47596ed52 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.process.review.sandbox/models/com.fasten.process.review.sandbox.argument.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.process.review.sandbox/models/com.fasten.process.review.sandbox.argument.mps
@@ -3,12 +3,9 @@
   <persistence version="9" />
   <languages>
     <use id="e8a04d94-4307-4f88-95a2-25f7c4f39437" name="com.mbeddr.formal.safety.gsn" version="3" />
-    <use id="6d475058-7ea2-490d-87e7-0f7f46dccc66" name="com.fasten.process.review" version="0" />
     <devkit ref="b64463ba-ae31-4cf7-be7b-afc13cab4daa(fasten.safety.gsn)" />
   </languages>
-  <imports>
-    <import index="t3u4" ref="r:5c41598e-c66f-4e8b-a6fb-0fedbfe86144(com.fasten.process.review.sandbox.argument_review)" />
-  </imports>
+  <imports />
   <registry>
     <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext">
       <concept id="2557074442922380897" name="de.slisson.mps.richtext.structure.Text" flags="ng" index="19SGf9">
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/com.fasten.safety.doc2word.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/com.fasten.safety.doc2word.msd
index 883107183..ba298ff94 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/com.fasten.safety.doc2word.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/com.fasten.safety.doc2word.msd
@@ -21,7 +21,6 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
     <dependency reexport="false">42606624-2faa-4717-ba66-77021cc11b53(com.mbeddr.formal.safety.gsn.doc)</dependency>
-    <dependency reexport="false">e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)</dependency>
     <dependency reexport="false">92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</dependency>
     <dependency reexport="false">6b84fb9e-5f09-4a61-bf31-3bfdc54820e3(com.mpsbasics.editor.utils)</dependency>
   </dependencies>
@@ -31,7 +30,6 @@
     <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="2" />
     <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:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
@@ -53,7 +51,6 @@
     <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="3" />
     <module reference="2374bc90-7e37-41f1-a9c4-c2e35194c36a(com.mbeddr.doc)" version="0" />
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
-    <module reference="e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)" version="0" />
     <module reference="e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)" version="0" />
     <module reference="42606624-2faa-4717-ba66-77021cc11b53(com.mbeddr.formal.safety.gsn.doc)" version="1" />
     <module reference="6464626a-ab04-4051-908e-5e8dc75acd78(com.mbeddr.formal.safety.gsn.ext)" version="2" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/models/com.fasten.safety.doc2word.plugin.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/models/com.fasten.safety.doc2word.plugin.mps
index e1eda8a4b..2961bd4d0 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/models/com.fasten.safety.doc2word.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/models/com.fasten.safety.doc2word.plugin.mps
@@ -15,7 +15,6 @@
     <import index="s3z8" ref="r:5b29d604-14e1-4547-b308-d116f5568071(com.mpsbasics.docx4j.core.word)" />
     <import index="9qxn" ref="r:b8395387-efa3-4cfc-a1d5-68b4f2c74a54(com.mpsbasics.docx4j.core.paths)" />
     <import index="3g0o" ref="r:a6263c3c-f5c8-43aa-8a86-c420dd6b206e(com.mpsbasics.docx4j.core.registry)" />
-    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="2c95" ref="r:5f7188a9-e7b4-4a2e-bef9-38d2cf379fdc(com.mbeddr.doc.structure)" />
     <import index="fmg0" ref="r:d9eaedd0-fc95-426d-9a41-18a4ffa37379(com.fasten.safety.doc2word.serializers)" />
     <import index="wvti" ref="r:b5f49a49-cb87-432f-9c94-6a91c1e055e1(com.mbeddr.formal.safety.gsn.doc.structure)" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/models/com.fasten.safety.doc2word.serializers.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/models/com.fasten.safety.doc2word.serializers.mps
index 9b404baf3..2f28dd135 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/models/com.fasten.safety.doc2word.serializers.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/models/com.fasten.safety.doc2word.serializers.mps
@@ -6,7 +6,6 @@
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
-    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
   </languages>
   <imports>
     <import index="s3z8" ref="r:5b29d604-14e1-4547-b308-d116f5568071(com.mpsbasics.docx4j.core.word)" />
@@ -15,7 +14,6 @@
     <import index="3g0o" ref="r:a6263c3c-f5c8-43aa-8a86-c420dd6b206e(com.mpsbasics.docx4j.core.registry)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="2c95" ref="r:5f7188a9-e7b4-4a2e-bef9-38d2cf379fdc(com.mbeddr.doc.structure)" />
     <import index="hwgx" ref="r:fd2980c8-676c-4b19-b524-18c70e02f8b7(com.mbeddr.core.base.behavior)" />
     <import index="anc6" ref="r:06d5a023-b4bd-4967-b05f-9b09e253aaeb(com.fasten.safety.doc2word.utils)" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/models/com.fasten.safety.doc2word.utils.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/models/com.fasten.safety.doc2word.utils.mps
index b4dbea80e..2e225fdc0 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/models/com.fasten.safety.doc2word.utils.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/models/com.fasten.safety.doc2word.utils.mps
@@ -14,11 +14,9 @@
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="vgdk" ref="71bb25aa-20fa-4c18-8954-1b176576f52d/java:org.docx4j.wml(com.mpsbasics.docx4j.lib/)" />
     <import index="5zxs" ref="71bb25aa-20fa-4c18-8954-1b176576f52d/java:org.docx4j.openpackaging.packages(com.mpsbasics.docx4j.lib/)" />
-    <import index="ztk3" ref="r:1d7819a9-9001-45b3-8897-91b2f81186cb(com.mbeddr.formal.base.tooling.ui)" />
     <import index="jan3" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.image(JDK/)" />
     <import index="oqcp" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.imageio(JDK/)" />
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
-    <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
     <import index="mryx" ref="r:da23d8da-3a75-4f33-96d8-7b3d3c2b2ccd(com.mpsbasics.editor.utils.screenshooter)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.fmea.sandbox/models/com.fasten.safety.fmea.sandbox._020_smoke_fmeda.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.fmea.sandbox/models/com.fasten.safety.fmea.sandbox._020_smoke_fmeda.mps
index a02ef141f..fa2cdd834 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.fmea.sandbox/models/com.fasten.safety.fmea.sandbox._020_smoke_fmeda.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.fmea.sandbox/models/com.fasten.safety.fmea.sandbox._020_smoke_fmeda.mps
@@ -4,7 +4,6 @@
   <languages>
     <use id="dc773f77-cced-42c8-ba62-465140b810a5" name="com.fasten.safety.fmea.iso26262" version="-1" />
     <use id="b43c548b-f75f-46e2-ad24-de9edd93e95e" name="com.fasten.safety.fmea" version="0" />
-    <use id="83ed2dfe-f724-46cc-852a-dce086daee3f" name="com.mbeddr.formal.base" version="0" />
   </languages>
   <imports />
   <registry>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/com.fasten.safety.ft.xfta.pluginSolution.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/com.fasten.safety.ft.xfta.pluginSolution.msd
index 43e883cb4..583db31e1 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/com.fasten.safety.ft.xfta.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/com.fasten.safety.ft.xfta.pluginSolution.msd
@@ -22,7 +22,6 @@
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
@@ -30,8 +29,6 @@
     <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:f3347d8a-0e79-4f35-8ac9-1574f25c986f:jetbrains.mps.execution.commands" version="0" />
-    <language slang="l:73c1a490-99fa-4d0d-8292-b8985697c74b:jetbrains.mps.execution.common" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:7ab1a6fa-0a11-4b95-9e48-75f363d6cb00:jetbrains.mps.lang.generator.plan" version="2" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.plugin.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.plugin.mps
index 9c5e8cc4e..a2228832e 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.plugin.mps
@@ -5,25 +5,17 @@
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
     <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" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
-    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
-    <use id="f3347d8a-0e79-4f35-8ac9-1574f25c986f" name="jetbrains.mps.execution.commands" version="0" />
   </languages>
   <imports>
-    <import index="qq03" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.actions(MPS.Platform/)" />
     <import index="spwl" ref="r:ea5ecccc-669e-41c1-a43d-021bc4263d33(com.fasten.safety.ft.structure)" />
     <import index="qofe" ref="r:6e99ad70-095a-4dfc-9cd7-6fd79b5cd071(com.fasten.safety.ft.xfta.pluginSolution.runner)" />
     <import index="xygl" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.progress(MPS.IDEA/)" />
     <import index="9jkl" ref="r:290677b7-fc8c-4e0e-97a0-1ad54da16539(com.fasten.safety.ft.xfta.pluginSolution.ui)" />
     <import index="2avh" ref="r:d71bd9ec-2dae-496f-9887-8fb9facf61b7(com.mbeddr.formal.base.tooling.tools)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
-    <import index="2ocj" ref="r:0af55dc0-14f5-45c8-bf12-3c673ca075ac(com.mbeddr.formal.base.tooling.analyzer)" />
     <import index="71xd" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.tools(MPS.Platform/)" />
-    <import index="4nm9" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.project(MPS.IDEA/)" />
     <import index="qkt" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.actionSystem(MPS.IDEA/)" />
-    <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
     <import index="fhlc" ref="r:89fb4363-ec36-4a06-ac51-b284d265c631(com.mbeddr.formal.base.tooling.make)" />
     <import index="alof" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.project(MPS.Platform/)" />
     <import index="z1c3" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.runner.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.runner.mps
index b85782dd7..0486cd39d 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.runner.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.runner.mps
@@ -2,9 +2,6 @@
 <model ref="r:6e99ad70-095a-4dfc-9cd7-6fd79b5cd071(com.fasten.safety.ft.xfta.pluginSolution.runner)">
   <persistence version="9" />
   <languages>
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
-    <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
-    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -14,14 +11,11 @@
     <import index="xygl" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.progress(MPS.IDEA/)" />
     <import index="btm1" ref="b0f8641f-bd77-4421-8425-30d9088a82f7/java:org.apache.commons.lang3(org.apache.commons/)" />
     <import index="fhlc" ref="r:89fb4363-ec36-4a06-ac51-b284d265c631(com.mbeddr.formal.base.tooling.make)" />
-    <import index="c9r8" ref="r:7a0d71dd-b922-4116-87c2-af6c95c3f7c3(com.mbeddr.formal.base.tooling.results_model)" />
     <import index="ltf9" ref="r:ce008aba-ba99-4e5f-b6e7-aee317483633(com.fasten.safety.ft.xfta_gen.util)" />
     <import index="8oaq" ref="b0f8641f-bd77-4421-8425-30d9088a82f7/java:org.apache.commons.io(org.apache.commons/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="z1c3" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" />
-    <import index="z1c4" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
-    <import index="71xd" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.tools(MPS.Platform/)" />
+    <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
     <import index="spwl" ref="r:ea5ecccc-669e-41c1-a43d-021bc4263d33(com.fasten.safety.ft.structure)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
@@ -742,7 +736,7 @@
         <property role="TrG5h" value="proj" />
         <property role="3TUv4t" value="true" />
         <node concept="3uibUv" id="2XVAqcw0cr7" role="1tU5fm">
-          <ref role="3uigEE" to="z1c4:~Project" resolve="Project" />
+          <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
         </node>
       </node>
       <node concept="37vLTG" id="2XVAqcvZXuW" role="3clF46">
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.ui.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.ui.mps
index 838dddefc..e552b071f 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.ui.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.ui.mps
@@ -4,7 +4,6 @@
   <languages>
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.sandbox/com.fasten.safety.ft.xfta.sandbox.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.sandbox/com.fasten.safety.ft.xfta.sandbox.msd
index 5078d4c73..8b5b1a6aa 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.sandbox/com.fasten.safety.ft.xfta.sandbox.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.sandbox/com.fasten.safety.ft.xfta.sandbox.msd
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.fasten.safety.ft.xfta.sandbox" uuid="9738a48e-5667-4629-b46c-5fa09808f84d" moduleVersion="0" compileInMPS="true">
+<solution name="com.fasten.safety.ft.xfta.sandbox" uuid="9738a48e-5667-4629-b46c-5fa09808f84d" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
   <facets>
-    <facet type="java">
+    <facet type="java" compile="mps" classes="mps" ext="no">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <sourcePath />
   <languageVersions />
   <dependencyVersions>
     <module reference="9738a48e-5667-4629-b46c-5fa09808f84d(com.fasten.safety.ft.xfta.sandbox)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hara.sandbox/com.fasten.safety.hara.sandbox.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hara.sandbox/com.fasten.safety.hara.sandbox.msd
index 6b4c8ddb1..4b05776f1 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hara.sandbox/com.fasten.safety.hara.sandbox.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hara.sandbox/com.fasten.safety.hara.sandbox.msd
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <languageVersions>
-    <language slang="l:83ed2dfe-f724-46cc-852a-dce086daee3f:com.mbeddr.formal.base" version="0" />
     <language slang="l:17da266c-02d9-4bbd-b69b-8a656b49f45c:com.mbeddr.formal.safety.hara" version="0" />
     <language slang="l:a798113f-e2cd-4e21-a8e2-ca1903cb9c43:com.mbeddr.formal.safety.iso26262" version="1" />
     <language slang="l:7e777b53-0a6b-4719-b36d-10475788d49f:com.mbeddr.formal.safety.stamp" version="2" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.modelquery.genplan/com.mbeddr.formal.safety.argument.modelquery.genplan.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.modelquery.genplan/com.mbeddr.formal.safety.argument.modelquery.genplan.msd
index 7a017e19d..5be5aa627 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.modelquery.genplan/com.mbeddr.formal.safety.argument.modelquery.genplan.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.modelquery.genplan/com.mbeddr.formal.safety.argument.modelquery.genplan.msd
@@ -10,9 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <dependencies>
-    <dependency reexport="false">43d5f6b1-f45e-44e8-8beb-2ef9aabefcbc(com.mbeddr.formal.safety.argument.modelquery.generator)</dependency>
-  </dependencies>
   <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" />
@@ -24,7 +21,6 @@
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
-    <module reference="43d5f6b1-f45e-44e8-8beb-2ef9aabefcbc(com.mbeddr.formal.safety.argument.modelquery.generator)" version="0" />
     <module reference="28c9d1d8-7af8-472d-8679-9b314648c201(com.mbeddr.formal.safety.argument.modelquery.genplan)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.modelquery.genplan/models/com.mbeddr.formal.safety.argument.modelquery.genplan.genplan.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.modelquery.genplan/models/com.mbeddr.formal.safety.argument.modelquery.genplan.genplan.mps
index 53292bae6..8a81a8257 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.modelquery.genplan/models/com.mbeddr.formal.safety.argument.modelquery.genplan.genplan.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.modelquery.genplan/models/com.mbeddr.formal.safety.argument.modelquery.genplan.genplan.mps
@@ -5,9 +5,7 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan" version="2" />
   </languages>
-  <imports>
-    <import index="oss0" ref="r:3eeee193-9a86-4738-92ea-2f088663b913(com.mbeddr.formal.safety.argument.modelquery.generator.templates@generator)" />
-  </imports>
+  <imports />
   <registry>
     <language id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan">
       <concept id="3705377275350227759" name="jetbrains.mps.lang.generator.plan.structure.IncludePlan" flags="ng" index="NozSJ">
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.process.sandbox/com.mbeddr.formal.safety.argument.process.sandbox.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.process.sandbox/com.mbeddr.formal.safety.argument.process.sandbox.msd
index 769e9a0eb..a9531734d 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.process.sandbox/com.mbeddr.formal.safety.argument.process.sandbox.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.process.sandbox/com.mbeddr.formal.safety.argument.process.sandbox.msd
@@ -10,20 +10,15 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <dependencies>
-    <dependency reexport="false">b1743c9b-5a13-4d6d-9530-c307d7257206(com.mbeddr.formal.safety.stamp.sandbox)</dependency>
-  </dependencies>
   <languageVersions>
     <language slang="l:83ed2dfe-f724-46cc-852a-dce086daee3f:com.mbeddr.formal.base" version="0" />
     <language slang="l:fdecb1e5-875e-41ef-a5fd-4b18f747f204:com.mbeddr.formal.safety.argument.process.artefacts" version="0" />
     <language slang="l:e8a04d94-4307-4f88-95a2-25f7c4f39437:com.mbeddr.formal.safety.gsn" version="3" />
     <language slang="l:8ca79d43-eb45-4791-bdd4-0d6130ff895b:de.itemis.mps.editor.diagram.layout" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
   </languageVersions>
   <dependencyVersions>
     <module reference="eff87b86-68b7-40e7-aaaf-a3ef396b574c(com.mbeddr.formal.safety.argument.process.sandbox)" version="0" />
-    <module reference="b1743c9b-5a13-4d6d-9530-c307d7257206(com.mbeddr.formal.safety.stamp.sandbox)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.process.sandbox/models/com.mbeddr.formal.safety.argument.process.sandbox._010_artefacts.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.process.sandbox/models/com.mbeddr.formal.safety.argument.process.sandbox._010_artefacts.mps
index f2676945e..f04fb6a56 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.process.sandbox/models/com.mbeddr.formal.safety.argument.process.sandbox._010_artefacts.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.process.sandbox/models/com.mbeddr.formal.safety.argument.process.sandbox._010_artefacts.mps
@@ -3,11 +3,8 @@
   <persistence version="9" />
   <languages>
     <use id="fdecb1e5-875e-41ef-a5fd-4b18f747f204" name="com.mbeddr.formal.safety.argument.process.artefacts" version="-1" />
-    <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
   </languages>
-  <imports>
-    <import index="v0ty" ref="r:f4296e65-905c-42ee-8349-52d0474604ad(com.mbeddr.formal.safety.stamp.sandbox._010_sandbox)" />
-  </imports>
+  <imports />
   <registry>
     <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext">
       <concept id="2557074442922380897" name="de.slisson.mps.richtext.structure.Text" flags="ng" index="19SGf9">
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/com.mbeddr.formal.safety.argument.runtime.pluginSolution.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/com.mbeddr.formal.safety.argument.runtime.pluginSolution.msd
index a2c43691c..e50900582 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/com.mbeddr.formal.safety.argument.runtime.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/com.mbeddr.formal.safety.argument.runtime.pluginSolution.msd
@@ -15,16 +15,12 @@
     <dependency reexport="false">e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
-    <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
-    <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide)</dependency>
-    <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
     <dependency reexport="false">546ac349-3106-438d-b92b-7d2ebfa2ade8(com.mbeddr.formal.safety.argument.runtime)</dependency>
     <dependency reexport="false">b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)</dependency>
     <dependency reexport="false">d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
@@ -32,13 +28,11 @@
     <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:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <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" />
@@ -51,21 +45,10 @@
     <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="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="81f324e1-38b1-44b1-85d2-19432dece3f6(com.mbeddr.formal.safety.argument.runtime.pluginSolution)" version="0" />
-    <module reference="e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)" version="0" />
     <module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" 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="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" version="0" />
     <module reference="019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide)" version="0" />
     <module reference="25092e07-e655-497c-92fb-558a8e3080ed(jetbrains.mps.ide.ui)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/models/com.mbeddr.formal.safety.argument.runtime.pluginSolution.plugin.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/models/com.mbeddr.formal.safety.argument.runtime.pluginSolution.plugin.mps
index 02f357116..69bda56d9 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/models/com.mbeddr.formal.safety.argument.runtime.pluginSolution.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/models/com.mbeddr.formal.safety.argument.runtime.pluginSolution.plugin.mps
@@ -4,28 +4,16 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
-    <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
-    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
-    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
   </languages>
   <imports>
     <import index="1ex9" ref="r:2766fc43-ebcb-436c-b5da-cd6cc6a3928e(com.mbeddr.formal.safety.argument.runtime.pluginSolution.ui)" />
     <import index="qkt" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.actionSystem(MPS.IDEA/)" />
     <import index="71xd" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.tools(MPS.Platform/)" />
-    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
-    <import index="z1c3" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" />
-    <import index="z1c4" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
-    <import index="alof" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.project(MPS.Platform/)" />
-    <import index="xygl" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.progress(MPS.IDEA/)" />
-    <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
-    <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
     <import index="vdvw" ref="r:0dab1cea-0da9-4395-bdbd-beac207923df(com.mbeddr.formal.safety.argument.runtime.structure)" />
     <import index="nbuu" ref="r:d3d83931-eefd-4730-b0d1-738f46c08648(com.mbeddr.formal.safety.argument.runtime.plugin)" />
-    <import index="48kf" ref="r:5f41c82d-84d1-4fb1-a1cf-6697d2365854(com.mbeddr.mpsutil.filepicker.behavior)" />
-    <import index="j9v" ref="r:9177d1ff-5a6c-42a0-91d7-676350251aaf(com.mbeddr.formal.safety.argument.runtime.pluginSolution.raw_runtime)" />
-    <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
     <import index="p7rk" ref="r:67c63462-ea88-46dc-b31c-baa1d0218b8f(com.mbeddr.formal.safety.argument.runtime.pluginSolution.utils)" />
     <import index="vxn5" ref="r:a3aca88b-58e4-4e34-884c-ec641c87bfca(com.mbeddr.formal.base.tooling.results_ui)" implicit="true" />
     <import index="tprs" ref="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)" implicit="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/models/com.mbeddr.formal.safety.argument.runtime.pluginSolution.ui.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/models/com.mbeddr.formal.safety.argument.runtime.pluginSolution.ui.mps
index 35e707a67..9585c648c 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/models/com.mbeddr.formal.safety.argument.runtime.pluginSolution.ui.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/models/com.mbeddr.formal.safety.argument.runtime.pluginSolution.ui.mps
@@ -2,16 +2,11 @@
 <model ref="r:2766fc43-ebcb-436c-b5da-cd6cc6a3928e(com.mbeddr.formal.safety.argument.runtime.pluginSolution.ui)">
   <persistence version="9" />
   <languages>
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
   <imports>
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
     <import index="vxn5" ref="r:a3aca88b-58e4-4e34-884c-ec641c87bfca(com.mbeddr.formal.base.tooling.results_ui)" />
-    <import index="gsia" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing.event(JDK/)" />
-    <import index="ztk3" ref="r:1d7819a9-9001-45b3-8897-91b2f81186cb(com.mbeddr.formal.base.tooling.ui)" />
-    <import index="r791" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing.text(JDK/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="hyam" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.event(JDK/)" />
     <import index="nbuu" ref="r:d3d83931-eefd-4730-b0d1-738f46c08648(com.mbeddr.formal.safety.argument.runtime.plugin)" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.spi.sandbox/com.mbeddr.formal.safety.argument.spi.sandbox.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.spi.sandbox/com.mbeddr.formal.safety.argument.spi.sandbox.msd
index 2cef841d1..be9407ef4 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.spi.sandbox/com.mbeddr.formal.safety.argument.spi.sandbox.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.spi.sandbox/com.mbeddr.formal.safety.argument.spi.sandbox.msd
@@ -10,9 +10,6 @@
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
-  <dependencies>
-    <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
-  </dependencies>
   <languageVersions>
     <language slang="l:e4dd8dcd-fbfe-4e69-bcdd-b4371f25f476:com.fasten.base.git" version="0" />
     <language slang="l:83ed2dfe-f724-46cc-852a-dce086daee3f:com.mbeddr.formal.base" version="0" />
@@ -29,13 +26,9 @@
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" 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="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="f87c9e9c-5b58-41cc-992f-8233e1a1d597(com.mbeddr.formal.safety.argument.spi.sandbox)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.spi.sandbox/models/com.mbeddr.formal.safety.argument.spi.sandbox._010_smoke.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.spi.sandbox/models/com.mbeddr.formal.safety.argument.spi.sandbox._010_smoke.mps
index 8c2b19f2f..0d5837663 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.spi.sandbox/models/com.mbeddr.formal.safety.argument.spi.sandbox._010_smoke.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.spi.sandbox/models/com.mbeddr.formal.safety.argument.spi.sandbox._010_smoke.mps
@@ -2,12 +2,9 @@
 <model ref="r:a7d744f1-6a73-4a61-a626-9afbf05ebf1a(com.mbeddr.formal.safety.argument.spi.sandbox._010_smoke)">
   <persistence version="9" />
   <languages>
-    <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
     <devkit ref="16e7e722-0522-46f7-b3be-41f15da742ed(fasten.safety.gsn.runtime)" />
   </languages>
-  <imports>
-    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
-  </imports>
+  <imports />
   <registry>
     <language id="1118d03f-f774-4a18-9e75-2357f8563d46" name="com.mbeddr.formal.safety.argument.spi">
       <concept id="3415218345380592611" name="com.mbeddr.formal.safety.argument.spi.structure.SpiAnnotationProvider" flags="ng" index="2XEZ4u" />
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 4ce21fb0d..6ecdbc212 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
@@ -7497,11 +7497,6 @@
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
           </node>
         </node>
-        <node concept="1SiIV0" id="5t37uj6UFbd" role="3bR37C">
-          <node concept="3bR9La" id="5t37uj6UFbe" role="1SiIV1">
-            <ref role="3bR37D" node="42jqVeFkUuV" resolve="com.mbeddr.formal.base" />
-          </node>
-        </node>
         <node concept="1BupzO" id="5t37uj6UFbu" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -7524,35 +7519,6 @@
             </node>
           </node>
         </node>
-        <node concept="1yeLz9" id="5t37uj6UFbx" role="1TViLv">
-          <property role="TrG5h" value="com.fasten.process.review.generator" />
-          <property role="3LESm3" value="422f456d-00c1-43e1-afde-92df55d9ffca" />
-          <node concept="1BupzO" id="5t37uj6UFbJ" role="3bR31x">
-            <property role="3ZfqAx" value="generator/templates" />
-            <property role="1Hdu6h" value="true" />
-            <property role="1HemKv" value="true" />
-            <node concept="3LXTmp" id="5t37uj6UFbK" role="1HemKq">
-              <node concept="398BVA" id="5t37uj6UFby" role="3LXTmr">
-                <ref role="398BVh" node="7he_lUurqtF" resolve="mbeddr.formal.safety.code" />
-                <node concept="2Ry0Ak" id="5t37uj6UFbz" role="iGT6I">
-                  <property role="2Ry0Am" value="languages" />
-                  <node concept="2Ry0Ak" id="5t37uj6UFb$" role="2Ry0An">
-                    <property role="2Ry0Am" value="com.fasten.process.review" />
-                    <node concept="2Ry0Ak" id="5t37uj6UFb_" role="2Ry0An">
-                      <property role="2Ry0Am" value="generator" />
-                      <node concept="2Ry0Ak" id="5t37uj6UFbA" role="2Ry0An">
-                        <property role="2Ry0Am" value="templates" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3qWCbU" id="5t37uj6UFbL" role="3LXTna">
-                <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3rtmxn" id="5t37uj6UF_8" role="3bR31x">
           <node concept="3LXTmp" id="5t37uj6UF_9" role="3rtmxm">
             <node concept="398BVA" id="5t37uj6UF_a" role="3LXTmr">
@@ -7574,6 +7540,11 @@
             <ref role="3bR37D" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
           </node>
         </node>
+        <node concept="1SiIV0" id="1a4oUCpP23p" role="3bR37C">
+          <node concept="1Busua" id="1a4oUCpP23q" role="1SiIV1">
+            <ref role="1Busuk" node="42jqVeFkUuV" resolve="com.mbeddr.formal.base" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="42jqVeFkUv2" role="3989C9">
@@ -10153,11 +10124,6 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7he_lUur_3h" role="3bR37C">
-          <node concept="3bR9La" id="7he_lUur_3i" role="1SiIV1">
-            <ref role="3bR37D" node="7he_lUury9o" resolve="com.mbeddr.formal.safety.gsn" />
-          </node>
-        </node>
         <node concept="1BupzO" id="5TezZ1Vejj9" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -10236,11 +10202,6 @@
             <ref role="3bR37D" node="2u7UHDCnRuK" resolve="com.mpsbasics.editor.utils" />
           </node>
         </node>
-        <node concept="1SiIV0" id="6TSnICNBUAe" role="3bR37C">
-          <node concept="3bR9La" id="6TSnICNBUAf" role="1SiIV1">
-            <ref role="3bR37D" to="90a9:4be$WTb1CbJ" resolve="de.itemis.mps.editor.diagram" />
-          </node>
-        </node>
       </node>
       <node concept="1E1JtD" id="5uFV_KLFgnB" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -10417,11 +10378,6 @@
             <ref role="1Busuk" node="7he_lUury9o" resolve="com.mbeddr.formal.safety.gsn" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7he_lUur_M8" role="3bR37C">
-          <node concept="3bR9La" id="7he_lUur_M9" role="1SiIV1">
-            <ref role="3bR37D" node="7he_lUurzLh" resolve="com.mbeddr.formal.safety.gsn.ext" />
-          </node>
-        </node>
         <node concept="1BupzO" id="5TezZ1VejjB" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -10459,11 +10415,6 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="56pBK14ypBJ" role="3bR37C">
-          <node concept="3bR9La" id="56pBK14ypBK" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6LaO" resolve="jetbrains.mps.lang.structure" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="4bL3rTRDt9$" role="3bR37C">
           <node concept="3bR9La" id="4bL3rTRDt9_" role="1SiIV1">
             <ref role="3bR37D" node="42jqVeFkUuV" resolve="com.mbeddr.formal.base" />
@@ -10531,11 +10482,6 @@
             <ref role="1Busuk" node="7he_lUury9o" resolve="com.mbeddr.formal.safety.gsn" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7he_lUurAwf" role="3bR37C">
-          <node concept="3bR9La" id="7he_lUurAwg" role="1SiIV1">
-            <ref role="3bR37D" node="7he_lUur$v6" resolve="com.mbeddr.formal.safety.gsn.patterns" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="7he_lUurDXB" role="3bR37C">
           <node concept="3bR9La" id="7he_lUurDXC" role="1SiIV1">
             <ref role="3bR37D" node="7he_lUurBQC" resolve="com.mbeddr.formal.safety.hara" />
@@ -10904,11 +10850,6 @@
             <ref role="3bR37D" node="42jqVeFkUuV" resolve="com.mbeddr.formal.base" />
           </node>
         </node>
-        <node concept="1SiIV0" id="5TwIvQFIwFg" role="3bR37C">
-          <node concept="3bR9La" id="5TwIvQFIwFh" role="1SiIV1">
-            <ref role="3bR37D" node="42jqVeFkUuP" resolve="com.mbeddr.formal.base.tooling" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="5TwIvQFIwFi" role="3bR37C">
           <node concept="3bR9La" id="5TwIvQFIwFj" role="1SiIV1">
             <ref role="3bR37D" node="7he_lUury9o" resolve="com.mbeddr.formal.safety.gsn" />
@@ -10919,11 +10860,6 @@
             <ref role="1Busuk" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
           </node>
         </node>
-        <node concept="1SiIV0" id="1hVhF3lk3Uk" role="3bR37C">
-          <node concept="3bR9La" id="1hVhF3lk3Ul" role="1SiIV1">
-            <ref role="3bR37D" node="2u7UHDCnPLY" resolve="com.mpsbasics.project.utils" />
-          </node>
-        </node>
       </node>
       <node concept="1E1JtD" id="7he_lUuxic9" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -10956,35 +10892,6 @@
             <ref role="1Busuk" node="7he_lUumK0b" resolve="com.mbeddr.formal.req.base" />
           </node>
         </node>
-        <node concept="1yeLz9" id="7he_lUuxiVs" role="1TViLv">
-          <property role="TrG5h" value="com.mbeddr.formal.safety.req#01" />
-          <property role="3LESm3" value="40737904-e87f-4008-8d74-4d30b5b852db" />
-          <node concept="1BupzO" id="5TezZ1Vejlh" role="3bR31x">
-            <property role="3ZfqAx" value="generator/template" />
-            <property role="1Hdu6h" value="true" />
-            <property role="1HemKv" value="true" />
-            <node concept="3LXTmp" id="5TezZ1Vejli" role="1HemKq">
-              <node concept="398BVA" id="5TezZ1Vejl4" role="3LXTmr">
-                <ref role="398BVh" node="7he_lUurqtF" resolve="mbeddr.formal.safety.code" />
-                <node concept="2Ry0Ak" id="5TezZ1Vejl5" role="iGT6I">
-                  <property role="2Ry0Am" value="languages" />
-                  <node concept="2Ry0Ak" id="5TezZ1Vejl6" role="2Ry0An">
-                    <property role="2Ry0Am" value="com.mbeddr.formal.safety.req" />
-                    <node concept="2Ry0Ak" id="5TezZ1Vejl7" role="2Ry0An">
-                      <property role="2Ry0Am" value="generator" />
-                      <node concept="2Ry0Ak" id="5TezZ1Vejl8" role="2Ry0An">
-                        <property role="2Ry0Am" value="template" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3qWCbU" id="5TezZ1Vejlj" role="3LXTna">
-                <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="1BupzO" id="5TezZ1Vejl1" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -11007,11 +10914,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="3mI4G9o66ln" role="3bR37C">
-          <node concept="3bR9La" id="3mI4G9o66lo" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
-          </node>
-        </node>
         <node concept="3rtmxn" id="7Jv9b4B5bYH" role="3bR31x">
           <node concept="3LXTmp" id="7Jv9b4B5bYI" role="3rtmxm">
             <node concept="3qWCbU" id="7Jv9b4B5bYJ" role="3LXTna">
@@ -11050,35 +10952,6 @@
             </node>
           </node>
         </node>
-        <node concept="1yeLz9" id="7he_lUur_VP" role="1TViLv">
-          <property role="TrG5h" value="com.mbeddr.formal.safety.gsn.smv#01" />
-          <property role="3LESm3" value="0281c698-7f76-4575-85b2-63ede6a1e805" />
-          <node concept="1BupzO" id="5TezZ1VejlJ" role="3bR31x">
-            <property role="3ZfqAx" value="generator/template" />
-            <property role="1Hdu6h" value="true" />
-            <property role="1HemKv" value="true" />
-            <node concept="3LXTmp" id="5TezZ1VejlK" role="1HemKq">
-              <node concept="398BVA" id="5TezZ1Vejly" role="3LXTmr">
-                <ref role="398BVh" node="7he_lUurqtF" resolve="mbeddr.formal.safety.code" />
-                <node concept="2Ry0Ak" id="5TezZ1Vejlz" role="iGT6I">
-                  <property role="2Ry0Am" value="languages" />
-                  <node concept="2Ry0Ak" id="5TezZ1Vejl$" role="2Ry0An">
-                    <property role="2Ry0Am" value="com.mbeddr.formal.safety.gsn.smv" />
-                    <node concept="2Ry0Ak" id="5TezZ1Vejl_" role="2Ry0An">
-                      <property role="2Ry0Am" value="generator" />
-                      <node concept="2Ry0Ak" id="5TezZ1VejlA" role="2Ry0An">
-                        <property role="2Ry0Am" value="template" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3qWCbU" id="5TezZ1VejlL" role="3LXTna">
-                <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="1SiIV0" id="7he_lUurAwh" role="3bR37C">
           <node concept="3bR9La" id="7he_lUurAwi" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:7Kfy9QB6L5O" resolve="jetbrains.mps.lang.extension" />
@@ -11124,16 +10997,6 @@
             <ref role="1Busuk" node="7he_lUury9o" resolve="com.mbeddr.formal.safety.gsn" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7he_lUurAwF" role="3bR37C">
-          <node concept="1Busua" id="7he_lUurAwG" role="1SiIV1">
-            <ref role="1Busuk" node="7he_lUur$v6" resolve="com.mbeddr.formal.safety.gsn.patterns" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7he_lUurBG8" role="3bR37C">
-          <node concept="3bR9La" id="7he_lUurBG9" role="1SiIV1">
-            <ref role="3bR37D" node="7he_lUur_VI" resolve="com.mbeddr.formal.safety.gsn.smv" />
-          </node>
-        </node>
         <node concept="1BupzO" id="5TezZ1Vejlv" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -11177,11 +11040,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="2IfJpoVTxsD" role="3bR37C">
-          <node concept="3bR9La" id="2IfJpoVTxsE" role="1SiIV1">
-            <ref role="3bR37D" node="5yQpAUIgMcT" resolve="com.mbeddr.formal.base.arch" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="8xY_IhvyUx" role="3bR37C">
           <node concept="3bR9La" id="8xY_IhvyUy" role="1SiIV1">
             <ref role="3bR37D" to="90a9:4be$WTb1AQa" resolve="de.itemis.mps.editor.diagram.runtime" />
@@ -11232,11 +11090,6 @@
               <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
             </node>
           </node>
-          <node concept="1SiIV0" id="7he_lUurBgs" role="3bR37C">
-            <node concept="3bR9La" id="7he_lUurBgt" role="1SiIV1">
-              <ref role="3bR37D" node="1gJVC85JQA9" resolve="com.mbeddr.formal.nusmv.ext" />
-            </node>
-          </node>
           <node concept="1SiIV0" id="7he_lUurBgu" role="3bR37C">
             <node concept="3bR9La" id="7he_lUurBgv" role="1SiIV1">
               <ref role="3bR37D" node="7he_lUuoZ0r" resolve="com.mbeddr.formal.spin" />
@@ -11252,16 +11105,6 @@
               <ref role="3bR37D" node="42jqVeFkUu5" resolve="com.mbeddr.formal.nusmv" />
             </node>
           </node>
-          <node concept="1SiIV0" id="7he_lUurBgA" role="3bR37C">
-            <node concept="3bR9La" id="7he_lUurBgB" role="1SiIV1">
-              <ref role="3bR37D" node="7he_lUuoWYb" resolve="com.mbeddr.formal.spin.c.core" />
-            </node>
-          </node>
-          <node concept="1SiIV0" id="7he_lUurBgD" role="3bR37C">
-            <node concept="3bR9La" id="7he_lUurBgC" role="1SiIV1">
-              <ref role="3bR37D" node="7he_lUuoZ10" resolve="com.mbeddr.formal.spin#5285453794051996712" />
-            </node>
-          </node>
           <node concept="1BupzO" id="5TezZ1Vejmf" role="3bR31x">
             <property role="3ZfqAx" value="generator/template" />
             <property role="1Hdu6h" value="true" />
@@ -11287,11 +11130,6 @@
               </node>
             </node>
           </node>
-          <node concept="1SiIV0" id="8xY_IhvyVe" role="3bR37C">
-            <node concept="3bR9La" id="8xY_IhvyVf" role="1SiIV1">
-              <ref role="3bR37D" to="90a9:PE3B26QCrP" resolve="org.apache.commons" />
-            </node>
-          </node>
         </node>
         <node concept="1SiIV0" id="7he_lUurAED" role="3bR37C">
           <node concept="3bR9La" id="7he_lUurAEE" role="1SiIV1">
@@ -11339,11 +11177,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="7he_lUurDdo" role="3bR37C">
-          <node concept="3bR9La" id="7he_lUurDdp" role="1SiIV1">
-            <ref role="3bR37D" node="7he_lUurAEj" resolve="com.mbeddr.formal.safety.gsn.odd" />
-          </node>
-        </node>
         <node concept="1BupzO" id="5TezZ1VejlX" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -11707,11 +11540,6 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6LfQ" resolve="jetbrains.mps.kernel" />
           </node>
         </node>
-        <node concept="1SiIV0" id="8xY_IhvyWf" role="3bR37C">
-          <node concept="3bR9La" id="8xY_IhvyWg" role="1SiIV1">
-            <ref role="3bR37D" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
-          </node>
-        </node>
       </node>
       <node concept="1E1JtD" id="5YWtEMPJWqd" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -11839,11 +11667,6 @@
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
           </node>
         </node>
-        <node concept="1SiIV0" id="y1G8y6aW2e" role="3bR37C">
-          <node concept="3bR9La" id="y1G8y6aW2f" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="y1G8y6aW2g" role="3bR37C">
           <node concept="3bR9La" id="y1G8y6aW2h" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
@@ -11897,11 +11720,6 @@
               <ref role="3bR37D" node="7he_lUury9o" resolve="com.mbeddr.formal.safety.gsn" />
             </node>
           </node>
-          <node concept="1SiIV0" id="y1G8y6aW2I" role="3bR37C">
-            <node concept="3bR9La" id="y1G8y6aW2J" role="1SiIV1">
-              <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
-            </node>
-          </node>
           <node concept="1BupzO" id="y1G8y6aW2X" role="3bR31x">
             <property role="3ZfqAx" value="generator/templates" />
             <property role="1Hdu6h" value="true" />
@@ -11927,11 +11745,6 @@
               </node>
             </node>
           </node>
-          <node concept="1SiIV0" id="1hVhF3lk3WF" role="3bR37C">
-            <node concept="3bR9La" id="1hVhF3lk3WG" role="1SiIV1">
-              <ref role="3bR37D" node="2u7UHDCnPLY" resolve="com.mpsbasics.project.utils" />
-            </node>
-          </node>
         </node>
         <node concept="3rtmxn" id="y1G8y6aWh8" role="3bR31x">
           <node concept="3LXTmp" id="y1G8y6aWh9" role="3rtmxm">
@@ -11949,11 +11762,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="52NnvmAmEjd" role="3bR37C">
-          <node concept="Rbm2T" id="52NnvmAmEje" role="1SiIV1">
-            <ref role="1E1Vl2" to="ffeo:7Kfy9QB6L9O" resolve="jetbrains.mps.lang.smodel" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="8xY_IhvyWQ" role="3bR37C">
           <node concept="1Busua" id="8xY_IhvyWR" role="1SiIV1">
             <ref role="1Busuk" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
@@ -11962,6 +11770,11 @@
         <node concept="1E0d5M" id="1hVhF3lqy4f" role="1E1XAP">
           <ref role="1E0d5P" node="2u7UHDCnPLY" resolve="com.mpsbasics.project.utils" />
         </node>
+        <node concept="1SiIV0" id="1a4oUCq3Bwn" role="3bR37C">
+          <node concept="Rbm2T" id="1a4oUCq3Bwo" role="1SiIV1">
+            <ref role="1E1Vl2" to="ffeo:7Kfy9QB6L9O" resolve="jetbrains.mps.lang.smodel" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="6VBHnHRiYOJ" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -12188,11 +12001,6 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
           </node>
         </node>
-        <node concept="1SiIV0" id="jPgKPEIjIq" role="3bR37C">
-          <node concept="3bR9La" id="jPgKPEIjIr" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="jPgKPEIjIs" role="3bR37C">
           <node concept="3bR9La" id="jPgKPEIjIt" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
@@ -12354,11 +12162,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="4y8PK54$TBy" role="3bR37C">
-          <node concept="3bR9La" id="4y8PK54$TBz" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="4y8PK54$TB$" role="3bR37C">
           <node concept="3bR9La" id="4y8PK54$TB_" role="1SiIV1">
             <ref role="3bR37D" node="7he_lUury9o" resolve="com.mbeddr.formal.safety.gsn" />
@@ -12544,11 +12347,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="5uFV_KLFefi" role="3bR37C">
-          <node concept="3bR9La" id="5uFV_KLFefj" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6LfQ" resolve="jetbrains.mps.kernel" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="8xY_IhvyXE" role="3bR37C">
           <node concept="1Busua" id="8xY_IhvyXF" role="1SiIV1">
             <ref role="1Busuk" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
@@ -12590,11 +12388,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="7he_lUurDds" role="3bR37C">
-          <node concept="3bR9La" id="7he_lUurDdt" role="1SiIV1">
-            <ref role="3bR37D" node="42jqVeFkUun" resolve="com.mbeddr.formal.base.expressions" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="7he_lUurDXD" role="3bR37C">
           <node concept="3bR9La" id="7he_lUurDXE" role="1SiIV1">
             <ref role="3bR37D" node="7he_lUurBQC" resolve="com.mbeddr.formal.safety.hara" />
@@ -12627,11 +12420,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="55oVyA0sXc1" role="3bR37C">
-          <node concept="3bR9La" id="55oVyA0sXc2" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="55oVyA0sXc3" role="3bR37C">
           <node concept="3bR9La" id="55oVyA0sXc4" role="1SiIV1">
             <ref role="3bR37D" node="42jqVeFkUuV" resolve="com.mbeddr.formal.base" />
@@ -12693,11 +12481,6 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6LfQ" resolve="jetbrains.mps.kernel" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7he_lUurEff" role="3bR37C">
-          <node concept="3bR9La" id="7he_lUurEfg" role="1SiIV1">
-            <ref role="3bR37D" node="7he_lUurDmQ" resolve="com.mbeddr.formal.safety.stamp" />
-          </node>
-        </node>
         <node concept="1BupzO" id="5TezZ1Vejnp" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -12735,26 +12518,11 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
           </node>
         </node>
-        <node concept="1SiIV0" id="5et_HVSOwT4" role="3bR37C">
-          <node concept="1Busua" id="5et_HVSOwT5" role="1SiIV1">
-            <ref role="1Busuk" node="42jqVeFkUuV" resolve="com.mbeddr.formal.base" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="1FMyjUPe0w0" role="3bR37C">
-          <node concept="3bR9La" id="1FMyjUPe0w1" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="8xY_IhvyXR" role="3bR37C">
           <node concept="3bR9La" id="8xY_IhvyXS" role="1SiIV1">
             <ref role="3bR37D" to="90a9:4be$WTb1AQa" resolve="de.itemis.mps.editor.diagram.runtime" />
           </node>
         </node>
-        <node concept="1SiIV0" id="8xY_IhvyXT" role="3bR37C">
-          <node concept="3bR9La" id="8xY_IhvyXU" role="1SiIV1">
-            <ref role="3bR37D" to="90a9:56Tfdun3uan" resolve="de.itemis.mps.editor.diagram.layout" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="8xY_IhvyY6" role="3bR37C">
           <node concept="1Busua" id="8xY_IhvyY7" role="1SiIV1">
             <ref role="1Busuk" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
@@ -12782,35 +12550,6 @@
             </node>
           </node>
         </node>
-        <node concept="1yeLz9" id="5uFV_KLFfhq" role="1TViLv">
-          <property role="TrG5h" value="com.mbeddr.formal.safety.stamp.ext#01" />
-          <property role="3LESm3" value="119e1bc3-08f2-4439-aade-f3cd419cfee0" />
-          <node concept="1BupzO" id="5uFV_KLFfhr" role="3bR31x">
-            <property role="3ZfqAx" value="generator/templates" />
-            <property role="1Hdu6h" value="true" />
-            <property role="1HemKv" value="true" />
-            <node concept="3LXTmp" id="5uFV_KLFgd_" role="1HemKq">
-              <node concept="398BVA" id="5uFV_KLFgdo" role="3LXTmr">
-                <ref role="398BVh" node="7he_lUurqtF" resolve="mbeddr.formal.safety.code" />
-                <node concept="2Ry0Ak" id="5uFV_KLFgdp" role="iGT6I">
-                  <property role="2Ry0Am" value="languages" />
-                  <node concept="2Ry0Ak" id="5uFV_KLFgdq" role="2Ry0An">
-                    <property role="2Ry0Am" value="com.mbeddr.formal.safety.stamp.ext" />
-                    <node concept="2Ry0Ak" id="5uFV_KLFgdr" role="2Ry0An">
-                      <property role="2Ry0Am" value="generator" />
-                      <node concept="2Ry0Ak" id="5uFV_KLFgds" role="2Ry0An">
-                        <property role="2Ry0Am" value="templates" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3qWCbU" id="5uFV_KLFgdA" role="3LXTna">
-                <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="1SiIV0" id="5uFV_KLFfhz" role="3bR37C">
           <node concept="3bR9La" id="5uFV_KLFfh$" role="1SiIV1">
             <ref role="3bR37D" node="7he_lUurBQC" resolve="com.mbeddr.formal.safety.hara" />
@@ -12853,11 +12592,6 @@
             <ref role="3bR37D" node="7he_lUurDmQ" resolve="com.mbeddr.formal.safety.stamp" />
           </node>
         </node>
-        <node concept="1SiIV0" id="5uFV_KLFgd7" role="3bR37C">
-          <node concept="3bR9La" id="5uFV_KLFgd8" role="1SiIV1">
-            <ref role="3bR37D" node="7he_lUuxic9" resolve="com.mbeddr.formal.safety.req" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="5uFV_KLFgdm" role="3bR37C">
           <node concept="1Busua" id="5uFV_KLFgdn" role="1SiIV1">
             <ref role="1Busuk" node="7he_lUurDmQ" resolve="com.mbeddr.formal.safety.stamp" />
@@ -12992,11 +12726,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="8xY_IhvyYy" role="3bR37C">
-          <node concept="3bR9La" id="8xY_IhvyYz" role="1SiIV1">
-            <ref role="3bR37D" to="90a9:4frYVBf39$o" resolve="de.itemis.mps.editor.diagram.styles" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="8xY_IhvyY$" role="3bR37C">
           <node concept="3bR9La" id="8xY_IhvyY_" role="1SiIV1">
             <ref role="3bR37D" to="90a9:2jlBy7bQtz0" resolve="com.mbeddr.mpsutil.treenotation.styles" />
@@ -13126,11 +12855,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="8xY_IhvyYP" role="3bR37C">
-          <node concept="3bR9La" id="8xY_IhvyYQ" role="1SiIV1">
-            <ref role="3bR37D" to="90a9:2NTGYE$JTGY" resolve="com.dslfoundry.plaintextgen" />
-          </node>
-        </node>
       </node>
       <node concept="1E1JtD" id="73rWdFZqzKL" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -13282,11 +13006,6 @@
             <ref role="1Busuk" node="73rWdFZqzKL" resolve="com.fasten.safety.fmea" />
           </node>
         </node>
-        <node concept="1SiIV0" id="8xY_IhvyZs" role="3bR37C">
-          <node concept="3bR9La" id="8xY_IhvyZt" role="1SiIV1">
-            <ref role="3bR37D" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
-          </node>
-        </node>
       </node>
       <node concept="1E1JtD" id="7e$PM2p8wVY" role="2G$12L">
         <property role="TrG5h" value="com.fasten.safety.fmea.iso26262" />
@@ -13625,11 +13344,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="8xY_Ihvz0c" role="3bR37C">
-          <node concept="3bR9La" id="8xY_Ihvz0d" role="1SiIV1">
-            <ref role="3bR37D" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
-          </node>
-        </node>
       </node>
       <node concept="1E1JtD" id="3DZJpXNn_S4" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -13689,35 +13403,6 @@
             <ref role="1Busuk" node="7he_lUurBQC" resolve="com.mbeddr.formal.safety.hara" />
           </node>
         </node>
-        <node concept="1yeLz9" id="3DZJpXNnCiR" role="1TViLv">
-          <property role="TrG5h" value="com.fasten.safety.hazop.iso26262.generator" />
-          <property role="3LESm3" value="9e1d88fc-f602-4fce-a8da-b49212416b20" />
-          <node concept="1BupzO" id="3DZJpXNnCj5" role="3bR31x">
-            <property role="3ZfqAx" value="generator/templates" />
-            <property role="1Hdu6h" value="true" />
-            <property role="1HemKv" value="true" />
-            <node concept="3LXTmp" id="3DZJpXNnCj6" role="1HemKq">
-              <node concept="398BVA" id="3DZJpXNnCiS" role="3LXTmr">
-                <ref role="398BVh" node="7he_lUurqtF" resolve="mbeddr.formal.safety.code" />
-                <node concept="2Ry0Ak" id="3DZJpXNnCiT" role="iGT6I">
-                  <property role="2Ry0Am" value="languages" />
-                  <node concept="2Ry0Ak" id="3DZJpXNnCiU" role="2Ry0An">
-                    <property role="2Ry0Am" value="com.fasten.safety.hazop.iso26262" />
-                    <node concept="2Ry0Ak" id="3DZJpXNnCiV" role="2Ry0An">
-                      <property role="2Ry0Am" value="generator" />
-                      <node concept="2Ry0Ak" id="3DZJpXNnCiW" role="2Ry0An">
-                        <property role="2Ry0Am" value="templates" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3qWCbU" id="3DZJpXNnCj7" role="3LXTna">
-                <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3rtmxn" id="3DZJpXNnCBl" role="3bR31x">
           <node concept="3LXTmp" id="3DZJpXNnCBm" role="3rtmxm">
             <node concept="398BVA" id="3DZJpXNnCBn" role="3LXTmr">
@@ -13751,11 +13436,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="y1G8y6bbic" role="3bR37C">
-          <node concept="3bR9La" id="y1G8y6bbid" role="1SiIV1">
-            <ref role="3bR37D" node="y1G8y6aW2D" resolve="com.mbeddr.formal.safety.argument.modelquery.generator" />
-          </node>
-        </node>
         <node concept="1BupzO" id="y1G8y6bbip" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -14166,11 +13846,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="8xY_Ihvz1v" role="3bR37C">
-          <node concept="3bR9La" id="8xY_Ihvz1w" role="1SiIV1">
-            <ref role="3bR37D" to="90a9:PE3B26QCrP" resolve="org.apache.commons" />
-          </node>
-        </node>
       </node>
       <node concept="1E1JtA" id="7he_lUurx31" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -14217,11 +13892,6 @@
             <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7he_lUurx3e" role="3bR37C">
-          <node concept="3bR9La" id="7he_lUurx3f" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="7he_lUurx3s" role="3bR37C">
           <node concept="3bR9La" id="7he_lUurx3t" role="1SiIV1">
             <ref role="3bR37D" node="6adXBxxUwrY" resolve="com.mbeddr.formal.base.pluginSolution" />
@@ -14693,11 +14363,6 @@
             <ref role="3bR37D" node="4SCnVTcAZiY" resolve="com.mbeddr.formal.safety.gsn.doc" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7YjSMFl$dyq" role="3bR37C">
-          <node concept="3bR9La" id="7YjSMFl$dyr" role="1SiIV1">
-            <ref role="3bR37D" node="42jqVeFkUuP" resolve="com.mbeddr.formal.base.tooling" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="8xY_Ihvz2s" role="3bR37C">
           <node concept="3bR9La" id="8xY_Ihvz2t" role="1SiIV1">
             <ref role="3bR37D" to="al5i:$bJ0jguQfr" resolve="com.mbeddr.core.base" />
@@ -14815,11 +14480,6 @@
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
           </node>
         </node>
-        <node concept="1SiIV0" id="6Z2HiVHt9t3" role="3bR37C">
-          <node concept="3bR9La" id="6Z2HiVHt9t4" role="1SiIV1">
-            <ref role="3bR37D" node="42jqVeFkUun" resolve="com.mbeddr.formal.base.expressions" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="6Z2HiVHt9t5" role="3bR37C">
           <node concept="3bR9La" id="6Z2HiVHt9t6" role="1SiIV1">
             <ref role="3bR37D" node="42jqVeFkUuV" resolve="com.mbeddr.formal.base" />
@@ -14847,35 +14507,6 @@
             </node>
           </node>
         </node>
-        <node concept="1yeLz9" id="6Z2HiVHt9tl" role="1TViLv">
-          <property role="TrG5h" value="com.fasten.safety.bayesian_network.generator" />
-          <property role="3LESm3" value="d6928dde-248a-483c-8a2c-af50f6c5e322" />
-          <node concept="1BupzO" id="6Z2HiVHt9tz" role="3bR31x">
-            <property role="3ZfqAx" value="generator/templates" />
-            <property role="1Hdu6h" value="true" />
-            <property role="1HemKv" value="true" />
-            <node concept="3LXTmp" id="6Z2HiVHt9t$" role="1HemKq">
-              <node concept="398BVA" id="6Z2HiVHt9tm" role="3LXTmr">
-                <ref role="398BVh" node="7he_lUurqtF" resolve="mbeddr.formal.safety.code" />
-                <node concept="2Ry0Ak" id="6Z2HiVHt9tn" role="iGT6I">
-                  <property role="2Ry0Am" value="languages" />
-                  <node concept="2Ry0Ak" id="6Z2HiVHt9to" role="2Ry0An">
-                    <property role="2Ry0Am" value="com.fasten.safety.bayesian_network" />
-                    <node concept="2Ry0Ak" id="6Z2HiVHt9tp" role="2Ry0An">
-                      <property role="2Ry0Am" value="generator" />
-                      <node concept="2Ry0Ak" id="6Z2HiVHt9tq" role="2Ry0An">
-                        <property role="2Ry0Am" value="templates" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3qWCbU" id="6Z2HiVHt9t_" role="3LXTna">
-                <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3rtmxn" id="6Z2HiVHt9BK" role="3bR31x">
           <node concept="3LXTmp" id="6Z2HiVHt9BL" role="3rtmxm">
             <node concept="398BVA" id="6Z2HiVHt9BM" role="3LXTmr">
@@ -14924,16 +14555,6 @@
             <ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
           </node>
         </node>
-        <node concept="1SiIV0" id="6Z2HiVHtfpi" role="3bR37C">
-          <node concept="3bR9La" id="6Z2HiVHtfpj" role="1SiIV1">
-            <ref role="3bR37D" node="7he_lUury9o" resolve="com.mbeddr.formal.safety.gsn" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="6Z2HiVHtfpk" role="3bR37C">
-          <node concept="3bR9La" id="6Z2HiVHtfpl" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="6Z2HiVHtfpm" role="3bR37C">
           <node concept="3bR9La" id="6Z2HiVHtfpn" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
@@ -14944,11 +14565,6 @@
             <ref role="3bR37D" to="90a9:PE3B26QCrP" resolve="org.apache.commons" />
           </node>
         </node>
-        <node concept="1SiIV0" id="6Z2HiVHtfpq" role="3bR37C">
-          <node concept="3bR9La" id="6Z2HiVHtfpr" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="6Z2HiVHtfps" role="3bR37C">
           <node concept="3bR9La" id="6Z2HiVHtfpt" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:2eDSGe9d1qi" resolve="jetbrains.mps.ide" />
@@ -15120,11 +14736,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="6i5G5_YU9MH" role="3bR37C">
-          <node concept="3bR9La" id="6i5G5_YU9MI" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="6i5G5_YU9MJ" role="3bR37C">
           <node concept="3bR9La" id="6i5G5_YU9MK" role="1SiIV1">
             <ref role="3bR37D" node="7he_lUury9o" resolve="com.mbeddr.formal.safety.gsn" />
@@ -15135,11 +14746,6 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
           </node>
         </node>
-        <node concept="1SiIV0" id="6i5G5_YU9MN" role="3bR37C">
-          <node concept="3bR9La" id="6i5G5_YU9MO" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="6i5G5_YU9MP" role="3bR37C">
           <node concept="3bR9La" id="6i5G5_YU9MQ" role="1SiIV1">
             <ref role="3bR37D" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
@@ -17224,9 +16830,6 @@
             <node concept="3_I8Xc" id="5cnt3YQuwM1" role="39821P">
               <ref role="3_I8Xa" to="al5i:48qh2gYgI9M" resolve="codereview" />
             </node>
-            <node concept="3_I8Xc" id="2ToO$l34Xke" role="39821P">
-              <ref role="3_I8Xa" to="al5i:7L_Y3n_fcDJ" resolve="com.mbeddr.mpsutil.actionsfilter" />
-            </node>
             <node concept="3_I8Xc" id="5cnt3YQuwTZ" role="39821P">
               <ref role="3_I8Xa" to="al5i:5fGcQI94qmQ" resolve="com.mbeddr.mpsutil.common" />
             </node>
@@ -18981,11 +18584,6 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="6ucyvMUDFge" role="3bR37C">
-          <node concept="3bR9La" id="6ucyvMUDFgf" role="1SiIV1">
-            <ref role="3bR37D" to="al5i:5fGcQI947Ca" resolve="com.mbeddr.mpsutil.common" />
-          </node>
-        </node>
         <node concept="1BupzO" id="6ucyvMUDFgo" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -19077,11 +18675,6 @@
             <ref role="3bR37D" node="7he_lUurAEj" resolve="com.mbeddr.formal.safety.gsn.odd" />
           </node>
         </node>
-        <node concept="1SiIV0" id="6ucyvMUMpPR" role="3bR37C">
-          <node concept="3bR9La" id="6ucyvMUMpPS" role="1SiIV1">
-            <ref role="3bR37D" node="5yQpAUIgOcH" resolve="com.mbeddr.formal.nusmv.cbd" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="6ucyvMUMpPT" role="3bR37C">
           <node concept="3bR9La" id="6ucyvMUMpPU" role="1SiIV1">
             <ref role="3bR37D" node="7he_lUur$v6" resolve="com.mbeddr.formal.safety.gsn.patterns" />
@@ -19122,11 +18715,6 @@
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
           </node>
         </node>
-        <node concept="1SiIV0" id="6ucyvMUMpQ9" role="3bR37C">
-          <node concept="3bR9La" id="6ucyvMUMpQa" role="1SiIV1">
-            <ref role="3bR37D" node="7he_lUurx31" resolve="com.mbeddr.formal.safety.gsn.spin.pluginSolution" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="6ucyvMUMpQb" role="3bR37C">
           <node concept="3bR9La" id="6ucyvMUMpQc" role="1SiIV1">
             <ref role="3bR37D" node="7he_lUury9o" resolve="com.mbeddr.formal.safety.gsn" />
@@ -19205,6 +18793,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="1a4oUCqtz_A" role="3bR37C">
+          <node concept="3bR9La" id="1a4oUCqtz_B" role="1SiIV1">
+            <ref role="3bR37D" node="5yQpAUIgMcT" resolve="com.mbeddr.formal.base.arch" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="6ucyvMUDFgv" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -19356,21 +18949,11 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="1HO1gFDIpvB" role="3bR37C">
-          <node concept="3bR9La" id="1HO1gFDIpvC" role="1SiIV1">
-            <ref role="3bR37D" node="1GpuQyTjDGk" resolve="com.fasten.safety.ft.pluginSolution" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="1HO1gFDIpvD" role="3bR37C">
           <node concept="3bR9La" id="1HO1gFDIpvE" role="1SiIV1">
             <ref role="3bR37D" node="3R_yAtWp1Os" resolve="com.fasten.safety.ft.xfta.pluginSolution" />
           </node>
         </node>
-        <node concept="1SiIV0" id="1HO1gFDOvyH" role="3bR37C">
-          <node concept="3bR9La" id="1HO1gFDOvyI" role="1SiIV1">
-            <ref role="3bR37D" to="90a9:2NTGYE$JTGY" resolve="com.dslfoundry.plaintextgen" />
-          </node>
-        </node>
         <node concept="3rtmxn" id="4euqtkrusKf" role="3bR31x">
           <node concept="3LXTmp" id="4euqtkrusKg" role="3rtmxm">
             <node concept="3qWCbU" id="4euqtkrusKh" role="3LXTna">
@@ -19405,11 +18988,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="4ziKDEnkJj2" role="3bR37C">
-          <node concept="3bR9La" id="4ziKDEnkJj3" role="1SiIV1">
-            <ref role="3bR37D" node="42jqVeFkUuP" resolve="com.mbeddr.formal.base.tooling" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="4ziKDEnkJj4" role="3bR37C">
           <node concept="3bR9La" id="4ziKDEnkJj5" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
@@ -19435,11 +19013,6 @@
             <ref role="3bR37D" to="al5i:1YMM4SJ2m0" resolve="com.mbeddr.doc" />
           </node>
         </node>
-        <node concept="1SiIV0" id="4ziKDEnkJje" role="3bR37C">
-          <node concept="3bR9La" id="4ziKDEnkJjf" role="1SiIV1">
-            <ref role="3bR37D" node="7he_lUumABC" resolve="com.mpsbasics.docx4j.lib" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="4ziKDEnkJjg" role="3bR37C">
           <node concept="3bR9La" id="4ziKDEnkJjh" role="1SiIV1">
             <ref role="3bR37D" to="90a9:PE3B26QCrP" resolve="org.apache.commons" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.cbd.pluginSolution/com.mbeddr.formal.safety.gsn.cbd.pluginSolution.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.cbd.pluginSolution/com.mbeddr.formal.safety.gsn.cbd.pluginSolution.msd
index 9597c9fb3..2ee85a151 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.cbd.pluginSolution/com.mbeddr.formal.safety.gsn.cbd.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.cbd.pluginSolution/com.mbeddr.formal.safety.gsn.cbd.pluginSolution.msd
@@ -31,7 +31,6 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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="2" />
-    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.cbd.pluginSolution/models/com.mbeddr.formal.safety.gsn.cbd.pluginSolution.analyzers.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.cbd.pluginSolution/models/com.mbeddr.formal.safety.gsn.cbd.pluginSolution.analyzers.mps
index 31b3cb286..5c4bc67d0 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.cbd.pluginSolution/models/com.mbeddr.formal.safety.gsn.cbd.pluginSolution.analyzers.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.cbd.pluginSolution/models/com.mbeddr.formal.safety.gsn.cbd.pluginSolution.analyzers.mps
@@ -4,7 +4,6 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <imports>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.cbd.pluginSolution/models/com.mbeddr.formal.safety.gsn.cbd.pluginSolution.plugin.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.cbd.pluginSolution/models/com.mbeddr.formal.safety.gsn.cbd.pluginSolution.plugin.mps
index 016b4f2b5..656ace9b0 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.cbd.pluginSolution/models/com.mbeddr.formal.safety.gsn.cbd.pluginSolution.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.cbd.pluginSolution/models/com.mbeddr.formal.safety.gsn.cbd.pluginSolution.plugin.mps
@@ -6,7 +6,6 @@
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
   </languages>
   <imports>
     <import index="2qxf" ref="r:92bf1daa-4510-4ff1-a9b1-c695f68c3f1d(com.mbeddr.formal.safety.gsn.patterns.structure)" />
@@ -15,8 +14,6 @@
     <import index="z1c4" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" />
     <import index="reb8" ref="r:c064a266-9199-4619-9d01-bcf72fc239bc(com.mbeddr.formal.nusmv.pluginSolution.plugin)" />
     <import index="50mr" ref="r:af038500-12da-40fb-9885-21380faabbb0(com.mbeddr.formal.safety.gsn.cbd.pluginSolution.analyzers)" />
-    <import index="bsp8" ref="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" />
-    <import index="vzqj" ref="r:27bd828c-1d2d-479d-bb43-b193c82b9c29(com.mbeddr.formal.nusmv.cbd.structure)" />
     <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
     <import index="87nw" ref="r:ca2ab6bb-f6e7-4c0f-a88c-b78b9b31fff3(de.slisson.mps.richtext.structure)" />
     <import index="t248" ref="r:2f83b5ad-2ce0-4f90-b7aa-45fc12b36f39(com.mbeddr.formal.safety.gsn.smv.pluginSolution.plugin)" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.patterns.lib/models/_010_patterns_catalogue.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.patterns.lib/models/_010_patterns_catalogue.mps
index e573aa698..49c2dd036 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.patterns.lib/models/_010_patterns_catalogue.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.patterns.lib/models/_010_patterns_catalogue.mps
@@ -2,13 +2,8 @@
 <model ref="r:975e4969-1ce0-4ded-8867-b40b46ebd140(_010_patterns_catalogue)">
   <persistence version="9" />
   <languages>
-    <use id="6464626a-ab04-4051-908e-5e8dc75acd78" name="com.mbeddr.formal.safety.gsn.ext" version="2" />
-    <use id="8ca79d43-eb45-4791-bdd4-0d6130ff895b" name="de.itemis.mps.editor.diagram.layout" version="0" />
-    <use id="f465db4c-63d4-40ef-afda-acd713dc19a1" name="com.mbeddr.formal.safety.gsn.patterns" version="0" />
-    <use id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext" version="0" />
-    <use id="e8a04d94-4307-4f88-95a2-25f7c4f39437" name="com.mbeddr.formal.safety.gsn" version="3" />
-    <use id="17da266c-02d9-4bbd-b69b-8a656b49f45c" name="com.mbeddr.formal.safety.hara" version="0" />
     <devkit ref="ac9a2847-3512-4af0-8db9-c20abbe2720a(fasten.safety)" />
+    <devkit ref="5e597493-feae-41d8-b052-3b0a41743991(fasten.safety.gsn.patterns)" />
   </languages>
   <imports />
   <registry>
@@ -125,7 +120,11 @@
       <property role="8uqrb" value="true" />
       <node concept="19SGf9" id="3jaLROLvqPg" role="2vnaTY">
         <node concept="19SUe$" id="3jaLROLvqPh" role="19SJt6">
-          <property role="19SUeA" value="Hazard {hazard_1} has &#10;been mitigated" />
+          <property role="19SUeA" value="Hazard " />
+        </node>
+        <node concept="oY6sn" id="1a4oUCoKBuA" role="19SJt6" />
+        <node concept="19SUe$" id="1a4oUCoKBuB" role="19SJt6">
+          <property role="19SUeA" value=" &#10;has been mitigated" />
         </node>
       </node>
     </node>
@@ -135,18 +134,18 @@
         <node concept="gqqVs" id="3jaLROLvqOq" role="37mO4d">
           <property role="gqqTZ" value="28.0" />
           <property role="gqqTW" value="141.0" />
-          <property role="gqqTX" value="166.0" />
-          <property role="gqqTy" value="84.0" />
+          <property role="gqqTX" value="212.0" />
+          <property role="gqqTy" value="69.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="3jaLROLvqTD" role="37mRID">
         <property role="37mO49" value="3804072175782964790" />
         <node concept="gqqVs" id="3jaLROLvqTC" role="37mO4d">
-          <property role="gqqTZ" value="20.5" />
+          <property role="gqqTZ" value="30.5" />
           <property role="gqqTW" value="13.0" />
-          <property role="gqqTX" value="164.0" />
-          <property role="gqqTy" value="66.0" />
+          <property role="gqqTX" value="194.0" />
+          <property role="gqqTy" value="50.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -199,10 +198,10 @@
       <node concept="37mRIm" id="7Y21hZB9Lxr" role="37mRID">
         <property role="37mO49" value="9187911824369457194" />
         <node concept="gqqVs" id="7Y21hZB9Lxp" role="37mO4d">
-          <property role="gqqTZ" value="159.0" />
+          <property role="gqqTZ" value="199.0" />
           <property role="gqqTW" value="37.0" />
-          <property role="gqqTX" value="130.0" />
-          <property role="gqqTy" value="61.0" />
+          <property role="gqqTX" value="145.0" />
+          <property role="gqqTy" value="50.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -211,8 +210,8 @@
         <node concept="gqqVs" id="7Y21hZB9Lyi" role="37mO4d">
           <property role="gqqTZ" value="151.0" />
           <property role="gqqTW" value="137.0" />
-          <property role="gqqTX" value="167.0" />
-          <property role="gqqTy" value="85.0" />
+          <property role="gqqTX" value="238.0" />
+          <property role="gqqTy" value="88.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -221,8 +220,8 @@
         <node concept="gqqVs" id="7Y21hZB9LAV" role="37mO4d">
           <property role="gqqTZ" value="43.0" />
           <property role="gqqTW" value="280.0" />
-          <property role="gqqTX" value="109.0" />
-          <property role="gqqTy" value="61.0" />
+          <property role="gqqTX" value="105.0" />
+          <property role="gqqTy" value="69.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -231,8 +230,8 @@
         <node concept="gqqVs" id="7Y21hZB9LCH" role="37mO4d">
           <property role="gqqTZ" value="171.0" />
           <property role="gqqTW" value="280.0" />
-          <property role="gqqTX" value="147.0" />
-          <property role="gqqTy" value="74.0" />
+          <property role="gqqTX" value="161.0" />
+          <property role="gqqTy" value="88.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -241,8 +240,8 @@
         <node concept="gqqVs" id="7Y21hZB9LDN" role="37mO4d">
           <property role="gqqTZ" value="339.0" />
           <property role="gqqTW" value="280.0" />
-          <property role="gqqTX" value="130.0" />
-          <property role="gqqTy" value="74.0" />
+          <property role="gqqTX" value="161.0" />
+          <property role="gqqTy" value="69.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -348,7 +347,7 @@
       <property role="8uqrb" value="true" />
       <node concept="19SGf9" id="7Y21hZB9LAa" role="2vnaTY">
         <node concept="19SUe$" id="7Y21hZB9LAb" role="19SJt6">
-          <property role="19SUeA" value="{Function Y} is safe." />
+          <property role="19SUeA" value="{Function Y} &#10;is safe." />
         </node>
       </node>
     </node>
@@ -357,7 +356,7 @@
       <property role="8uqrb" value="true" />
       <node concept="19SGf9" id="7Y21hZB9LBW" role="2vnaTY">
         <node concept="19SUe$" id="7Y21hZB9LBX" role="19SJt6">
-          <property role="19SUeA" value="Interactions between system&#10;functions are non-hazardous." />
+          <property role="19SUeA" value="Interactions between &#10;system functions are &#10;non-hazardous." />
         </node>
       </node>
     </node>
@@ -428,40 +427,40 @@
       <node concept="37mRIm" id="66sW2d$Fj5C" role="37mRID">
         <property role="37mO49" value="7033760752849465645" />
         <node concept="gqqVs" id="66sW2d$Fj5B" role="37mO4d">
-          <property role="gqqTZ" value="405.876201290465" />
-          <property role="gqqTW" value="43.000000000000014" />
-          <property role="gqqTX" value="329.0" />
-          <property role="gqqTy" value="117.0" />
+          <property role="gqqTZ" value="597.876201290465" />
+          <property role="gqqTW" value="70.00000000000001" />
+          <property role="gqqTX" value="320.0" />
+          <property role="gqqTy" value="88.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="66sW2d$FjiP" role="37mRID">
         <property role="37mO49" value="7033760752849466487" />
         <node concept="gqqVs" id="66sW2d$FjiO" role="37mO4d">
-          <property role="gqqTZ" value="245.0" />
-          <property role="gqqTW" value="209.0" />
-          <property role="gqqTX" value="189.0" />
-          <property role="gqqTy" value="80.0" />
+          <property role="gqqTZ" value="417.0" />
+          <property role="gqqTW" value="216.0" />
+          <property role="gqqTX" value="236.0" />
+          <property role="gqqTy" value="88.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="66sW2d$FjqR" role="37mRID">
         <property role="37mO49" value="7033760752849466998" />
         <node concept="gqqVs" id="66sW2d$FjqQ" role="37mO4d">
-          <property role="gqqTZ" value="15.0" />
-          <property role="gqqTW" value="208.0" />
-          <property role="gqqTX" value="183.0" />
-          <property role="gqqTy" value="80.0" />
+          <property role="gqqTZ" value="187.0" />
+          <property role="gqqTW" value="215.0" />
+          <property role="gqqTX" value="194.0" />
+          <property role="gqqTy" value="69.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="66sW2d$FjCj" role="37mRID">
         <property role="37mO49" value="7033760752849467706" />
         <node concept="gqqVs" id="66sW2d$FjCi" role="37mO4d">
-          <property role="gqqTZ" value="19.0" />
-          <property role="gqqTW" value="339.0" />
-          <property role="gqqTX" value="214.0" />
-          <property role="gqqTy" value="89.0" />
+          <property role="gqqTZ" value="187.0" />
+          <property role="gqqTW" value="328.0" />
+          <property role="gqqTX" value="208.0" />
+          <property role="gqqTy" value="107.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -598,10 +597,10 @@
       <node concept="37mRIm" id="6yFQEkQTEeF" role="37mRID">
         <property role="37mO49" value="7542362404087571226" />
         <node concept="gqqVs" id="6yFQEkQTEeE" role="37mO4d">
-          <property role="gqqTZ" value="124.0" />
-          <property role="gqqTW" value="43.0" />
-          <property role="gqqTX" value="182.0" />
-          <property role="gqqTy" value="102.0" />
+          <property role="gqqTZ" value="296.0" />
+          <property role="gqqTW" value="50.0" />
+          <property role="gqqTX" value="268.0" />
+          <property role="gqqTy" value="88.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -616,18 +615,18 @@
                 <property role="2Vclpz" value="160.5" />
               </node>
               <node concept="2VclrF" id="6yFQEkQTEoQ" role="3wpmZP">
-                <property role="2Vclpx" value="0.0" />
-                <property role="2Vclpz" value="0.0" />
+                <property role="2Vclpx" value="172.0" />
+                <property role="2Vclpz" value="7.0" />
               </node>
             </node>
           </node>
           <node concept="2VclrF" id="1QoXEbd_yOl" role="2Vcluh">
-            <property role="2Vclpx" value="217.43731952978598" />
-            <property role="2Vclpz" value="178.0990400744696" />
+            <property role="2Vclpx" value="389.437319529786" />
+            <property role="2Vclpz" value="188.0990400744696" />
           </node>
           <node concept="2VclrF" id="1QoXEbd_yP6" role="2Vcluh">
-            <property role="2Vclpx" value="126.9756440369739" />
-            <property role="2Vclpz" value="178.0990400744696" />
+            <property role="2Vclpx" value="298.9756440369739" />
+            <property role="2Vclpz" value="188.0990400744696" />
           </node>
         </node>
       </node>
@@ -642,18 +641,18 @@
                 <property role="2Vclpz" value="166.5" />
               </node>
               <node concept="2VclrF" id="6yFQEkQTEsW" role="3wpmZP">
-                <property role="2Vclpx" value="0.0" />
-                <property role="2Vclpz" value="0.0" />
+                <property role="2Vclpx" value="172.0" />
+                <property role="2Vclpz" value="7.0" />
               </node>
             </node>
           </node>
           <node concept="2VclrF" id="1QoXEbd_ySF" role="2Vcluh">
-            <property role="2Vclpx" value="216.93497653679174" />
-            <property role="2Vclpz" value="182.0" />
+            <property role="2Vclpx" value="388.93497653679174" />
+            <property role="2Vclpz" value="189.0" />
           </node>
           <node concept="2VclrF" id="1QoXEbd_yTs" role="2Vcluh">
-            <property role="2Vclpx" value="340.0" />
-            <property role="2Vclpz" value="182.0" />
+            <property role="2Vclpx" value="512.0" />
+            <property role="2Vclpz" value="189.0" />
           </node>
         </node>
       </node>
@@ -686,15 +685,11 @@
                 <property role="2Vclpz" value="79.77524445948809" />
               </node>
               <node concept="2VclrF" id="6An1fjBbj45" role="3wpmZP">
-                <property role="2Vclpx" value="0.0" />
-                <property role="2Vclpz" value="0.0" />
+                <property role="2Vclpx" value="172.0" />
+                <property role="2Vclpz" value="7.0" />
               </node>
             </node>
           </node>
-          <node concept="2VclrF" id="1QoXEbd_yKK" role="2Vcluh">
-            <property role="2Vclpx" value="372.28190327132916" />
-            <property role="2Vclpz" value="102.24290287219648" />
-          </node>
         </node>
       </node>
       <node concept="37mRIm" id="1S7Fn2AJaAs" role="37mRID">
@@ -782,8 +777,8 @@
                 <property role="2Vclpz" value="304.77549368978555" />
               </node>
               <node concept="2VclrF" id="3cxPYidJAAw" role="3wpmZP">
-                <property role="2Vclpx" value="0.0" />
-                <property role="2Vclpz" value="0.0" />
+                <property role="2Vclpx" value="172.0" />
+                <property role="2Vclpz" value="7.0" />
               </node>
             </node>
           </node>
@@ -792,10 +787,10 @@
       <node concept="37mRIm" id="3cxPYidJALx" role="37mRID">
         <property role="37mO49" value="3684463346796358606" />
         <node concept="gqqVs" id="3cxPYidJALw" role="37mO4d">
-          <property role="gqqTZ" value="-122.03447042791103" />
-          <property role="gqqTW" value="62.50000000000002" />
-          <property role="gqqTX" value="159.0" />
-          <property role="gqqTy" value="63.0" />
+          <property role="gqqTZ" value="49.96552957208897" />
+          <property role="gqqTW" value="69.50000000000003" />
+          <property role="gqqTX" value="180.0" />
+          <property role="gqqTy" value="50.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -810,8 +805,8 @@
                 <property role="2Vclpz" value="73.88007176460684" />
               </node>
               <node concept="2VclrF" id="3cxPYidJB2J" role="3wpmZP">
-                <property role="2Vclpx" value="0.0" />
-                <property role="2Vclpz" value="0.0" />
+                <property role="2Vclpx" value="172.0" />
+                <property role="2Vclpz" value="7.0" />
               </node>
             </node>
           </node>
@@ -822,7 +817,7 @@
       <property role="TrG5h" value="A1 - Context Assumptions" />
       <node concept="19SGf9" id="66sW2d$Fj9z" role="2vnaTY">
         <node concept="19SUe$" id="66sW2d$Fj9$" role="19SJt6">
-          <property role="19SUeA" value="System's assumptions about its operating context&#10;as defined in " />
+          <property role="19SUeA" value="System's assumptions about its &#10;operating context as defined &#10;in " />
         </node>
         <node concept="27blvF" id="3cxPYidJBwf" role="19SJt6" />
         <node concept="19SUe$" id="3cxPYidJBwg" role="19SJt6" />
@@ -833,7 +828,7 @@
       <property role="8uqr5" value="true" />
       <node concept="19SGf9" id="66sW2d$FjmM" role="2vnaTY">
         <node concept="19SUe$" id="66sW2d$FjmN" role="19SJt6">
-          <property role="19SUeA" value="Process-based and regulation&#10;compliance argumentation approach" />
+          <property role="19SUeA" value="Process-based and regulation&#10;compliance argumentation &#10;approach" />
         </node>
       </node>
     </node>
@@ -849,8 +844,8 @@
       <property role="8uqrb" value="true" />
       <property role="TrG5h" value="G1.2" />
       <node concept="19SGf9" id="66sW2d$FjBu" role="2vnaTY">
-        <node concept="19SUe$" id="66sW2d$FjBv" role="19SJt6">
-          <property role="19SUeA" value="The residual risk associated with &#10;the identified system hazards &#10;has been reduced to an acceptable level" />
+        <node concept="19SUe$" id="1a4oUCoMgHa" role="19SJt6">
+          <property role="19SUeA" value="The residual risk associated&#10;with the identified system&#10;hazards has been reduced to&#10;an acceptable level" />
         </node>
       </node>
     </node>
@@ -858,11 +853,11 @@
       <property role="TrG5h" value="G1.1" />
       <node concept="19SGf9" id="6yFQEkQTEhi" role="2vnaTY">
         <node concept="19SUe$" id="6yFQEkQTEhj" role="19SJt6">
-          <property role="19SUeA" value="System defined in&#10;" />
+          <property role="19SUeA" value="System defined in " />
         </node>
         <node concept="27blvF" id="6yFQEkQTEhg" role="19SJt6" />
         <node concept="19SUe$" id="6yFQEkQTEhf" role="19SJt6">
-          <property role="19SUeA" value="&#10; is sufficiently safe &#10; in the given operating context" />
+          <property role="19SUeA" value=" &#10;is sufficiently safe in the given &#10;operating context" />
         </node>
       </node>
     </node>
@@ -914,8 +909,8 @@
         <node concept="gqqVs" id="1QoXEbd_xLb" role="37mO4d">
           <property role="gqqTZ" value="381.53521126760563" />
           <property role="gqqTW" value="19.0" />
-          <property role="gqqTX" value="146.0" />
-          <property role="gqqTy" value="63.0" />
+          <property role="gqqTX" value="222.0" />
+          <property role="gqqTy" value="50.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -924,8 +919,8 @@
         <node concept="gqqVs" id="1QoXEbd_xNh" role="37mO4d">
           <property role="gqqTZ" value="758.0" />
           <property role="gqqTW" value="185.56307031669348" />
-          <property role="gqqTX" value="217.0" />
-          <property role="gqqTy" value="80.0" />
+          <property role="gqqTX" value="245.0" />
+          <property role="gqqTy" value="88.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -933,9 +928,9 @@
         <property role="37mO49" value="2132725602654231975" />
         <node concept="gqqVs" id="1QoXEbd_xRl" role="37mO4d">
           <property role="gqqTZ" value="765.0" />
-          <property role="gqqTW" value="315.5630703166935" />
-          <property role="gqqTX" value="159.0" />
-          <property role="gqqTy" value="89.0" />
+          <property role="gqqTW" value="375.5630703166935" />
+          <property role="gqqTX" value="231.0" />
+          <property role="gqqTy" value="88.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -994,28 +989,28 @@
         <node concept="gqqVs" id="1QoXEbd_y8n" role="37mO4d">
           <property role="gqqTZ" value="1010.2553191489363" />
           <property role="gqqTW" value="185.56307031669348" />
-          <property role="gqqTX" value="154.0" />
-          <property role="gqqTy" value="80.0" />
+          <property role="gqqTX" value="217.0" />
+          <property role="gqqTy" value="69.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="1QoXEbd_yaQ" role="37mRID">
         <property role="37mO49" value="2132725602654233216" />
         <node concept="gqqVs" id="1QoXEbd_yaP" role="37mO4d">
-          <property role="gqqTZ" value="582.5000000000001" />
-          <property role="gqqTW" value="131.90874932903915" />
-          <property role="gqqTX" value="157.0" />
-          <property role="gqqTy" value="89.0" />
+          <property role="gqqTZ" value="494.7108433734941" />
+          <property role="gqqTW" value="166.5630703166935" />
+          <property role="gqqTX" value="229.0" />
+          <property role="gqqTy" value="88.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="1QoXEbd_ycI" role="37mRID">
         <property role="37mO49" value="2132725602654233335" />
         <node concept="gqqVs" id="1QoXEbd_ycH" role="37mO4d">
-          <property role="gqqTZ" value="582.5000000000001" />
-          <property role="gqqTW" value="245.79763821792807" />
-          <property role="gqqTX" value="146.0" />
-          <property role="gqqTy" value="76.0" />
+          <property role="gqqTZ" value="510.2108433734941" />
+          <property role="gqqTW" value="271.0988430372052" />
+          <property role="gqqTX" value="198.0" />
+          <property role="gqqTy" value="69.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -1400,8 +1395,8 @@
         <node concept="gqqVs" id="1S7Fn2AIwfi" role="37mO4d">
           <property role="gqqTZ" value="53.536231884058054" />
           <property role="gqqTW" value="19.0" />
-          <property role="gqqTX" value="245.0" />
-          <property role="gqqTy" value="70.0" />
+          <property role="gqqTX" value="296.0" />
+          <property role="gqqTy" value="69.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -1410,8 +1405,8 @@
         <node concept="gqqVs" id="1S7Fn2AIwfk" role="37mO4d">
           <property role="gqqTZ" value="25.03623188405805" />
           <property role="gqqTW" value="-118.55072463768133" />
-          <property role="gqqTX" value="302.0" />
-          <property role="gqqTy" value="83.0" />
+          <property role="gqqTX" value="378.0" />
+          <property role="gqqTy" value="69.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -1560,20 +1555,20 @@
       <node concept="37mRIm" id="1S7Fn2AIxQD" role="37mRID">
         <property role="37mO49" value="2163888845319970067" />
         <node concept="gqqVs" id="1S7Fn2AIxQC" role="37mO4d">
-          <property role="gqqTZ" value="249.00000000000009" />
-          <property role="gqqTW" value="312.0630703166935" />
-          <property role="gqqTX" value="245.0" />
-          <property role="gqqTy" value="96.0" />
+          <property role="gqqTZ" value="139.00000000000009" />
+          <property role="gqqTW" value="382.0630703166935" />
+          <property role="gqqTX" value="289.0" />
+          <property role="gqqTy" value="69.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="1S7Fn2AIxQF" role="37mRID">
         <property role="37mO49" value="2163888845319970057" />
         <node concept="gqqVs" id="1S7Fn2AIxQE" role="37mO4d">
-          <property role="gqqTZ" value="213.0" />
+          <property role="gqqTZ" value="153.0" />
           <property role="gqqTW" value="182.0" />
-          <property role="gqqTX" value="294.0" />
-          <property role="gqqTy" value="83.0" />
+          <property role="gqqTX" value="305.0" />
+          <property role="gqqTy" value="88.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -1739,6 +1734,10 @@
               </node>
             </node>
           </node>
+          <node concept="2VclrF" id="1a4oUCoKBln" role="2Vcluh">
+            <property role="2Vclpx" value="465.98068499715737" />
+            <property role="2Vclpz" value="257.35288982015004" />
+          </node>
         </node>
       </node>
       <node concept="37mRIm" id="1S7Fn2AJ3_y" role="37mRID">
@@ -1754,20 +1753,20 @@
       <node concept="37mRIm" id="1S7Fn2AJ3_$" role="37mRID">
         <property role="37mO49" value="2163888845320108180" />
         <node concept="gqqVs" id="1S7Fn2AJ3_z" role="37mO4d">
-          <property role="gqqTZ" value="-72.0933977455712" />
-          <property role="gqqTW" value="312.0630703166935" />
-          <property role="gqqTX" value="245.0" />
-          <property role="gqqTy" value="70.0" />
+          <property role="gqqTZ" value="-152.0933977455712" />
+          <property role="gqqTW" value="382.0630703166935" />
+          <property role="gqqTX" value="227.0" />
+          <property role="gqqTy" value="69.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="1S7Fn2AJ3_A" role="37mRID">
         <property role="37mO49" value="2163888845320108170" />
         <node concept="gqqVs" id="1S7Fn2AJ3__" role="37mO4d">
-          <property role="gqqTZ" value="-90.13043478260836" />
+          <property role="gqqTZ" value="-180.13043478260835" />
           <property role="gqqTW" value="182.34567901234567" />
-          <property role="gqqTX" value="281.0" />
-          <property role="gqqTy" value="83.0" />
+          <property role="gqqTX" value="305.0" />
+          <property role="gqqTy" value="88.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -1854,9 +1853,17 @@
             <property role="2Vclpz" value="346.90088987767126" />
           </node>
           <node concept="2VclrF" id="1S7Fn2AJ4I_" role="2Vcluh">
+            <property role="2Vclpx" value="-223.1759415088668" />
+            <property role="2Vclpz" value="140.48541994063194" />
+          </node>
+          <node concept="2VclrF" id="1a4oUCoK$IJ" role="2Vcluh">
             <property role="2Vclpx" value="-170.46022201665093" />
             <property role="2Vclpz" value="-68.30468667604299" />
           </node>
+          <node concept="2VclrF" id="1a4oUCoK_Qx" role="2Vcluh">
+            <property role="2Vclpx" value="10.84337349397589" />
+            <property role="2Vclpz" value="-101.90361445783131" />
+          </node>
         </node>
       </node>
       <node concept="37mRIm" id="1S7Fn2AJ4VI" role="37mRID">
@@ -1882,10 +1889,10 @@
       <node concept="37mRIm" id="1S7Fn2AJ5iO" role="37mRID">
         <property role="37mO49" value="2163888845320115262" />
         <node concept="gqqVs" id="1S7Fn2AJ5iN" role="37mO4d">
-          <property role="gqqTZ" value="1000.7553191489361" />
-          <property role="gqqTW" value="424.0737086145658" />
-          <property role="gqqTX" value="173.0" />
-          <property role="gqqTy" value="127.0" />
+          <property role="gqqTZ" value="1030.755319148936" />
+          <property role="gqqTW" value="534.0737086145658" />
+          <property role="gqqTX" value="218.0" />
+          <property role="gqqTy" value="50.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -1910,10 +1917,10 @@
       <node concept="37mRIm" id="1S7Fn2AJ5Ez" role="37mRID">
         <property role="37mO49" value="2163888845320116779" />
         <node concept="gqqVs" id="1S7Fn2AJ5Ey" role="37mO4d">
-          <property role="gqqTZ" value="978.755319148936" />
-          <property role="gqqTW" value="315.5630703166935" />
-          <property role="gqqTX" value="217.0" />
-          <property role="gqqTy" value="63.0" />
+          <property role="gqqTZ" value="1048.755319148936" />
+          <property role="gqqTW" value="375.5630703166935" />
+          <property role="gqqTX" value="173.0" />
+          <property role="gqqTy" value="69.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -1958,8 +1965,8 @@
         <node concept="gqqVs" id="3cxPYidB3C2" role="37mO4d">
           <property role="gqqTZ" value="445.991733006736" />
           <property role="gqqTW" value="-118.55072463768133" />
-          <property role="gqqTX" value="234.0" />
-          <property role="gqqTy" value="63.0" />
+          <property role="gqqTX" value="236.0" />
+          <property role="gqqTy" value="69.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -1985,7 +1992,7 @@
     <node concept="2vmxSQ" id="1QoXEbd_xKp" role="2vn1q5">
       <property role="TrG5h" value="C3.1" />
       <node concept="19SGf9" id="1QoXEbd_yI3" role="2vnaTY">
-        <node concept="19SUe$" id="1QoXEbd_yI4" role="19SJt6">
+        <node concept="19SUe$" id="1a4oUCoK$3K" role="19SJt6">
           <property role="19SUeA" value="Functional safety architecture" />
         </node>
       </node>
@@ -1996,7 +2003,7 @@
         <node concept="19SUe$" id="24coDzLtVRa" role="19SJt6" />
         <node concept="2NwIr6" id="24coDzLtVR9" role="19SJt6" />
         <node concept="19SUe$" id="24coDzLtVRb" role="19SJt6">
-          <property role="19SUeA" value=" is &#10;refined by functional safety architecture" />
+          <property role="19SUeA" value=" is &#10;refined by functional safety &#10;architecture" />
         </node>
       </node>
     </node>
@@ -2014,16 +2021,16 @@
     <node concept="2vmxQI" id="1QoXEbd_y7z" role="2vn1q5">
       <property role="TrG5h" value="Str3.5" />
       <node concept="19SGf9" id="24coDzLtUJs" role="2vnaTY">
-        <node concept="19SUe$" id="24coDzLtUJt" role="19SJt6">
-          <property role="19SUeA" value="Argument by &#10;verification method {vm}" />
+        <node concept="19SUe$" id="1a4oUCoK$3L" role="19SJt6">
+          <property role="19SUeA" value="Argument by verification &#10;method {vm}" />
         </node>
       </node>
     </node>
     <node concept="2XiGWt" id="1QoXEbd_ya0" role="2vn1q5">
       <property role="TrG5h" value="A3" />
       <node concept="19SGf9" id="24coDzLtUrr" role="2vnaTY">
-        <node concept="19SUe$" id="24coDzLtUrs" role="19SJt6">
-          <property role="19SUeA" value="All necessary &#10;technical safety requirements &#10;have been identified" />
+        <node concept="19SUe$" id="1a4oUCoK$3M" role="19SJt6">
+          <property role="19SUeA" value="All necessary technical&#10;safety requirements&#10;have been identified" />
         </node>
       </node>
     </node>
@@ -2143,7 +2150,7 @@
       <property role="TrG5h" value="Str3.2" />
       <node concept="19SGf9" id="1S7Fn2AJ3yb" role="2vnaTY">
         <node concept="19SUe$" id="1S7Fn2AJ3yc" role="19SJt6">
-          <property role="19SUeA" value="All functional subrequirements from &#10;" />
+          <property role="19SUeA" value="All functional sub-requirements from &#10;" />
         </node>
         <node concept="27blvF" id="1S7Fn2AJ3yd" role="19SJt6" />
         <node concept="19SUe$" id="1S7Fn2AJ3ye" role="19SJt6">
@@ -2164,7 +2171,7 @@
     <node concept="3t1IcU" id="1S7Fn2AJ5gY" role="2vn1q5">
       <property role="TrG5h" value="Sn3.1" />
       <node concept="19SGf9" id="1S7Fn2AJ5w2" role="2vnaTY">
-        <node concept="19SUe$" id="1S7Fn2AJ5w3" role="19SJt6">
+        <node concept="19SUe$" id="1a4oUCoK$3N" role="19SJt6">
           <property role="19SUeA" value="Test results" />
         </node>
       </node>
@@ -2172,8 +2179,8 @@
     <node concept="2vn7WC" id="1S7Fn2AJ5CF" role="2vn1q5">
       <property role="TrG5h" value="G3.5" />
       <node concept="19SGf9" id="1S7Fn2AJ5R5" role="2vnaTY">
-        <node concept="19SUe$" id="1S7Fn2AJ5R6" role="19SJt6">
-          <property role="19SUeA" value="System satisfies its functional requirements" />
+        <node concept="19SUe$" id="1a4oUCoK$3O" role="19SJt6">
+          <property role="19SUeA" value="System satisfies its&#10;functional requirements" />
         </node>
       </node>
     </node>
@@ -2187,8 +2194,8 @@
     </node>
     <node concept="2XiGWt" id="3cxPYidB3A8" role="2vn1q5">
       <node concept="19SGf9" id="3cxPYidB3P3" role="2vnaTY">
-        <node concept="19SUe$" id="3cxPYidB3Q6" role="19SJt6">
-          <property role="19SUeA" value="List of requirements ais complete and correct" />
+        <node concept="19SUe$" id="1a4oUCoK$3P" role="19SJt6">
+          <property role="19SUeA" value="List of requirements&#10;ais complete and correct" />
         </node>
       </node>
     </node>
@@ -3260,38 +3267,38 @@
         <node concept="gqqVs" id="1S7Fn2AJ6cT" role="37mO4d">
           <property role="gqqTZ" value="286.79710144927566" />
           <property role="gqqTW" value="2.2971014492753628" />
-          <property role="gqqTX" value="146.0" />
-          <property role="gqqTy" value="63.0" />
+          <property role="gqqTX" value="215.0" />
+          <property role="gqqTy" value="50.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="1S7Fn2AJ6cW" role="37mRID">
         <property role="37mO49" value="2163888845320118966" />
         <node concept="gqqVs" id="1S7Fn2AJ6cV" role="37mO4d">
-          <property role="gqqTZ" value="748.4999999999998" />
+          <property role="gqqTZ" value="838.4999999999998" />
           <property role="gqqTW" value="146.99999999999986" />
-          <property role="gqqTX" value="217.0" />
-          <property role="gqqTy" value="80.0" />
+          <property role="gqqTX" value="238.0" />
+          <property role="gqqTy" value="88.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="1S7Fn2AJ6cY" role="37mRID">
         <property role="37mO49" value="2163888845320118971" />
         <node concept="gqqVs" id="1S7Fn2AJ6cX" role="37mO4d">
-          <property role="gqqTZ" value="772.4999999999997" />
+          <property role="gqqTZ" value="842.4999999999997" />
           <property role="gqqTW" value="271.4999999999999" />
-          <property role="gqqTX" value="169.0" />
-          <property role="gqqTy" value="89.0" />
+          <property role="gqqTX" value="224.0" />
+          <property role="gqqTy" value="88.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="1S7Fn2AJ6d0" role="37mRID">
         <property role="37mO49" value="2163888845320118976" />
         <node concept="gqqVs" id="1S7Fn2AJ6cZ" role="37mO4d">
-          <property role="gqqTZ" value="977.8768115942024" />
+          <property role="gqqTZ" value="1117.8768115942025" />
           <property role="gqqTW" value="146.99999999999986" />
-          <property role="gqqTX" value="154.0" />
-          <property role="gqqTy" value="80.0" />
+          <property role="gqqTX" value="208.0" />
+          <property role="gqqTy" value="69.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -3320,8 +3327,8 @@
         <node concept="gqqVs" id="1S7Fn2AJ6d5" role="37mO4d">
           <property role="gqqTZ" value="-44.000000000000114" />
           <property role="gqqTW" value="-1.2028985507246266" />
-          <property role="gqqTX" value="245.0" />
-          <property role="gqqTy" value="70.0" />
+          <property role="gqqTX" value="289.0" />
+          <property role="gqqTy" value="69.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -3330,68 +3337,68 @@
         <node concept="gqqVs" id="1S7Fn2AJ6d7" role="37mO4d">
           <property role="gqqTZ" value="-62.0" />
           <property role="gqqTW" value="-114.0" />
-          <property role="gqqTX" value="281.0" />
-          <property role="gqqTy" value="70.0" />
+          <property role="gqqTX" value="305.0" />
+          <property role="gqqTy" value="69.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="1S7Fn2AJ6da" role="37mRID">
         <property role="37mO49" value="2163888845320119002" />
         <node concept="gqqVs" id="1S7Fn2AJ6d9" role="37mO4d">
-          <property role="gqqTZ" value="-26.000000000000025" />
+          <property role="gqqTZ" value="-6.000000000000028" />
           <property role="gqqTW" value="272.9999999999999" />
-          <property role="gqqTX" value="245.0" />
-          <property role="gqqTy" value="70.0" />
+          <property role="gqqTX" value="233.0" />
+          <property role="gqqTy" value="69.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="1S7Fn2AJ6dc" role="37mRID">
         <property role="37mO49" value="2163888845320119008" />
         <node concept="gqqVs" id="1S7Fn2AJ6db" role="37mO4d">
-          <property role="gqqTZ" value="-61.99999999999994" />
+          <property role="gqqTZ" value="-41.99999999999994" />
           <property role="gqqTW" value="143.99999999999991" />
-          <property role="gqqTX" value="281.0" />
-          <property role="gqqTy" value="83.0" />
+          <property role="gqqTX" value="305.0" />
+          <property role="gqqTy" value="88.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="1S7Fn2AJ6de" role="37mRID">
         <property role="37mO49" value="2163888845320119016" />
         <node concept="gqqVs" id="1S7Fn2AJ6dd" role="37mO4d">
-          <property role="gqqTZ" value="-322.0" />
+          <property role="gqqTZ" value="-352.0" />
           <property role="gqqTW" value="272.9999999999999" />
-          <property role="gqqTX" value="245.0" />
-          <property role="gqqTy" value="70.0" />
+          <property role="gqqTX" value="227.0" />
+          <property role="gqqTy" value="69.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="1S7Fn2AJ6dg" role="37mRID">
         <property role="37mO49" value="2163888845320119022" />
         <node concept="gqqVs" id="1S7Fn2AJ6df" role="37mO4d">
-          <property role="gqqTZ" value="-340.0" />
+          <property role="gqqTZ" value="-370.0" />
           <property role="gqqTW" value="143.99999999999991" />
-          <property role="gqqTX" value="281.0" />
-          <property role="gqqTy" value="83.0" />
+          <property role="gqqTX" value="305.0" />
+          <property role="gqqTy" value="88.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="1S7Fn2AJ6di" role="37mRID">
         <property role="37mO49" value="2163888845320119029" />
         <node concept="gqqVs" id="1S7Fn2AJ6dh" role="37mO4d">
-          <property role="gqqTZ" value="981.8768115942023" />
+          <property role="gqqTZ" value="1101.8768115942023" />
           <property role="gqqTW" value="393.5724637681158" />
-          <property role="gqqTX" value="150.0" />
-          <property role="gqqTy" value="133.0" />
+          <property role="gqqTX" value="271.0" />
+          <property role="gqqTy" value="50.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="1S7Fn2AJ6dk" role="37mRID">
         <property role="37mO49" value="2163888845320119032" />
         <node concept="gqqVs" id="1S7Fn2AJ6dj" role="37mO4d">
-          <property role="gqqTZ" value="995.3768115942023" />
+          <property role="gqqTZ" value="1145.3768115942023" />
           <property role="gqqTW" value="271.4999999999999" />
-          <property role="gqqTX" value="119.0" />
-          <property role="gqqTy" value="76.0" />
+          <property role="gqqTX" value="166.0" />
+          <property role="gqqTy" value="69.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -3452,7 +3459,7 @@
             <property role="2Vclpz" value="92.24763862630982" />
           </node>
           <node concept="2VclrF" id="1S7Fn2AJ8rD" role="2Vcluh">
-            <property role="2Vclpx" value="842.150456328111" />
+            <property role="2Vclpx" value="951.3077898970338" />
             <property role="2Vclpz" value="92.24763862630982" />
           </node>
         </node>
@@ -3478,8 +3485,8 @@
             <property role="2Vclpz" value="91.30434782608697" />
           </node>
           <node concept="2VclrF" id="1S7Fn2AJ8os" role="2Vcluh">
-            <property role="2Vclpx" value="1033.333382549911" />
-            <property role="2Vclpz" value="91.30429860951004" />
+            <property role="2Vclpx" value="1216.3651270606892" />
+            <property role="2Vclpz" value="91.30434782608697" />
           </node>
         </node>
       </node>
@@ -3692,20 +3699,20 @@
       <node concept="37mRIm" id="1S7Fn2AJ99m" role="37mRID">
         <property role="37mO49" value="2163888845320130943" />
         <node concept="gqqVs" id="1S7Fn2AJ99l" role="37mO4d">
-          <property role="gqqTZ" value="236.99999999999991" />
+          <property role="gqqTZ" value="316.9999999999999" />
           <property role="gqqTW" value="272.99999999999994" />
-          <property role="gqqTX" value="245.0" />
-          <property role="gqqTy" value="70.0" />
+          <property role="gqqTX" value="227.0" />
+          <property role="gqqTy" value="69.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="1S7Fn2AJ99o" role="37mRID">
         <property role="37mO49" value="2163888845320130933" />
         <node concept="gqqVs" id="1S7Fn2AJ99n" role="37mO4d">
-          <property role="gqqTZ" value="218.99999999999983" />
+          <property role="gqqTZ" value="278.99999999999983" />
           <property role="gqqTW" value="143.9999999999999" />
-          <property role="gqqTX" value="281.0" />
-          <property role="gqqTy" value="83.0" />
+          <property role="gqqTX" value="305.0" />
+          <property role="gqqTy" value="88.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -3774,10 +3781,10 @@
       <node concept="37mRIm" id="1S7Fn2AJ9Gs" role="37mRID">
         <property role="37mO49" value="2163888845320133279" />
         <node concept="gqqVs" id="1S7Fn2AJ9Gr" role="37mO4d">
-          <property role="gqqTZ" value="513.695652173913" />
+          <property role="gqqTZ" value="613.695652173913" />
           <property role="gqqTW" value="142.99999999999983" />
-          <property role="gqqTX" value="227.0" />
-          <property role="gqqTy" value="88.0" />
+          <property role="gqqTX" value="159.0" />
+          <property role="gqqTy" value="69.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -3802,8 +3809,8 @@
             <property role="2Vclpz" value="91.3043478260869" />
           </node>
           <node concept="2VclrF" id="1S7Fn2AJa5Q" role="2Vcluh">
-            <property role="2Vclpx" value="610.1449275362326" />
-            <property role="2Vclpz" value="91.3043478260869" />
+            <property role="2Vclpx" value="689.3703871564987" />
+            <property role="2Vclpz" value="91.30431163868204" />
           </node>
         </node>
       </node>
@@ -3822,7 +3829,7 @@
         <node concept="19SUe$" id="1S7Fn2AJ6aS" role="19SJt6" />
         <node concept="2NwIr6" id="1S7Fn2AJ6aT" role="19SJt6" />
         <node concept="19SUe$" id="1S7Fn2AJ6aU" role="19SJt6">
-          <property role="19SUeA" value=" is &#10;refined by technical safety architecture" />
+          <property role="19SUeA" value=" is &#10;refined by technical safety &#10;architecture" />
         </node>
       </node>
     </node>
@@ -3943,7 +3950,7 @@
       <property role="TrG5h" value="Str4.2" />
       <node concept="19SGf9" id="1S7Fn2AJ6bJ" role="2vnaTY">
         <node concept="19SUe$" id="1S7Fn2AJ6bK" role="19SJt6">
-          <property role="19SUeA" value="All techical subrequirements from &#10;" />
+          <property role="19SUeA" value="All techical sub-requirements from &#10;" />
         </node>
         <node concept="27blvF" id="1S7Fn2AJ6bL" role="19SJt6" />
         <node concept="19SUe$" id="1S7Fn2AJ6bM" role="19SJt6">
@@ -4021,7 +4028,7 @@
       <property role="8uqr5" value="true" />
       <node concept="19SGf9" id="1S7Fn2AJa7Z" role="2vnaTY">
         <node concept="19SUe$" id="1S7Fn2AJa80" role="19SJt6">
-          <property role="19SUeA" value="Argument about HW/SW integration" />
+          <property role="19SUeA" value="Argument about &#10;HW/SW integration" />
         </node>
       </node>
     </node>
@@ -4123,30 +4130,30 @@
       <node concept="37mRIm" id="66sW2d$Flg7" role="37mRID">
         <property role="37mO49" value="7033760752849474495" />
         <node concept="gqqVs" id="66sW2d$Flg6" role="37mO4d">
-          <property role="gqqTZ" value="819.0" />
-          <property role="gqqTW" value="125.0" />
-          <property role="gqqTX" value="166.0" />
-          <property role="gqqTy" value="89.0" />
+          <property role="gqqTZ" value="1357.0" />
+          <property role="gqqTW" value="217.0" />
+          <property role="gqqTX" value="222.0" />
+          <property role="gqqTy" value="69.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="66sW2d$Flmg" role="37mRID">
         <property role="37mO49" value="7033760752849474885" />
         <node concept="gqqVs" id="66sW2d$Flmf" role="37mO4d">
-          <property role="gqqTZ" value="775.0" />
-          <property role="gqqTW" value="298.0" />
-          <property role="gqqTX" value="148.0" />
-          <property role="gqqTy" value="87.0" />
+          <property role="gqqTZ" value="1244.0" />
+          <property role="gqqTW" value="346.0" />
+          <property role="gqqTX" value="201.0" />
+          <property role="gqqTy" value="50.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="66sW2d$FloC" role="37mRID">
         <property role="37mO49" value="7033760752849475036" />
         <node concept="gqqVs" id="66sW2d$FloB" role="37mO4d">
-          <property role="gqqTZ" value="949.0" />
-          <property role="gqqTW" value="297.0" />
-          <property role="gqqTX" value="147.0" />
-          <property role="gqqTy" value="89.0" />
+          <property role="gqqTZ" value="1503.0" />
+          <property role="gqqTW" value="346.0" />
+          <property role="gqqTX" value="189.0" />
+          <property role="gqqTy" value="88.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -4163,53 +4170,51 @@
       <node concept="37mRIm" id="66sW2d$FlUS" role="37mRID">
         <property role="37mO49" value="7033760752849477251" />
         <node concept="2VclpC" id="66sW2d$FlUR" role="37mO4d">
-          <node concept="3ul5H1" id="66sW2d$FlUT" role="3ul5Gx">
-            <property role="3ul5GH" value="label" />
-            <node concept="3wpmZ1" id="66sW2d$FlUU" role="3ul5Gz">
-              <node concept="2VclrF" id="66sW2d$FlUV" role="3wpmZR">
-                <property role="2Vclpx" value="830.0" />
-                <property role="2Vclpz" value="227.75" />
+          <node concept="2VclrF" id="1a4oUCoMOoU" role="2Vcluh">
+            <property role="2Vclpx" value="1468.0" />
+            <property role="2Vclpz" value="316.0" />
+          </node>
+          <node concept="2VclrF" id="1a4oUCoMOoV" role="2Vcluh">
+            <property role="2Vclpx" value="1344.0" />
+            <property role="2Vclpz" value="316.0" />
+          </node>
+          <node concept="3ul5H1" id="1a4oUCoMOoW" role="3ul5Gx">
+            <node concept="3wpmZ1" id="1a4oUCoMOoX" role="3ul5Gz">
+              <node concept="2VclrF" id="1a4oUCoMOoY" role="3wpmZR">
+                <property role="2Vclpx" value="0" />
+                <property role="2Vclpz" value="0" />
               </node>
-              <node concept="2VclrF" id="66sW2d$FlUW" role="3wpmZP">
-                <property role="2Vclpx" value="0.0" />
-                <property role="2Vclpz" value="0.0" />
+              <node concept="2VclrF" id="1a4oUCoMOoZ" role="3wpmZP">
+                <property role="2Vclpx" value="1634" />
+                <property role="2Vclpz" value="316" />
               </node>
             </node>
           </node>
-          <node concept="2VclrF" id="1QoXEbd_z0q" role="2Vcluh">
-            <property role="2Vclpx" value="910.0071422922371" />
-            <property role="2Vclpz" value="250.0" />
-          </node>
-          <node concept="2VclrF" id="1QoXEbd_z1b" role="2Vcluh">
-            <property role="2Vclpx" value="839.9980346311039" />
-            <property role="2Vclpz" value="250.0" />
-          </node>
         </node>
       </node>
       <node concept="37mRIm" id="66sW2d$FlXl" role="37mRID">
         <property role="37mO49" value="7033760752849477407" />
         <node concept="2VclpC" id="66sW2d$FlXk" role="37mO4d">
-          <node concept="3ul5H1" id="66sW2d$FlXm" role="3ul5Gx">
-            <property role="3ul5GH" value="label" />
-            <node concept="3wpmZ1" id="66sW2d$FlXn" role="3ul5Gz">
-              <node concept="2VclrF" id="66sW2d$FlXo" role="3wpmZR">
-                <property role="2Vclpx" value="922.5" />
-                <property role="2Vclpz" value="230.5" />
+          <node concept="2VclrF" id="1a4oUCoMOp0" role="2Vcluh">
+            <property role="2Vclpx" value="1468.0" />
+            <property role="2Vclpz" value="316.0" />
+          </node>
+          <node concept="2VclrF" id="1a4oUCoMOp1" role="2Vcluh">
+            <property role="2Vclpx" value="1597.0" />
+            <property role="2Vclpz" value="316.0" />
+          </node>
+          <node concept="3ul5H1" id="1a4oUCoMOp2" role="3ul5Gx">
+            <node concept="3wpmZ1" id="1a4oUCoMOp3" role="3ul5Gz">
+              <node concept="2VclrF" id="1a4oUCoMOp4" role="3wpmZR">
+                <property role="2Vclpx" value="0" />
+                <property role="2Vclpz" value="0" />
               </node>
-              <node concept="2VclrF" id="66sW2d$FlXp" role="3wpmZP">
-                <property role="2Vclpx" value="0.0" />
-                <property role="2Vclpz" value="0.0" />
+              <node concept="2VclrF" id="1a4oUCoMOp5" role="3wpmZP">
+                <property role="2Vclpx" value="1887" />
+                <property role="2Vclpz" value="316" />
               </node>
             </node>
           </node>
-          <node concept="2VclrF" id="1QoXEbd_z1Y" role="2Vcluh">
-            <property role="2Vclpx" value="908.994680645817" />
-            <property role="2Vclpz" value="249.0" />
-          </node>
-          <node concept="2VclrF" id="1QoXEbd_z2J" role="2Vcluh">
-            <property role="2Vclpx" value="1002.9937133405616" />
-            <property role="2Vclpz" value="249.0" />
-          </node>
         </node>
       </node>
       <node concept="37mRIm" id="66sW2d$FlZT" role="37mRID">
@@ -4273,37 +4278,36 @@
       <node concept="37mRIm" id="66sW2d$FmVK" role="37mRID">
         <property role="37mO49" value="7033760752849481368" />
         <node concept="gqqVs" id="66sW2d$FmVJ" role="37mO4d">
-          <property role="gqqTZ" value="432.0" />
-          <property role="gqqTW" value="-41.0" />
-          <property role="gqqTX" value="223.0" />
-          <property role="gqqTy" value="89.0" />
+          <property role="gqqTZ" value="1053.0" />
+          <property role="gqqTW" value="50.0" />
+          <property role="gqqTX" value="208.0" />
+          <property role="gqqTy" value="107.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="66sW2d$Fn58" role="37mRID">
         <property role="37mO49" value="7033760752849482001" />
         <node concept="2VclpC" id="66sW2d$Fn57" role="37mO4d">
-          <node concept="3ul5H1" id="66sW2d$Fn59" role="3ul5Gx">
-            <property role="3ul5GH" value="label" />
-            <node concept="3wpmZ1" id="66sW2d$Fn5a" role="3ul5Gz">
-              <node concept="2VclrF" id="66sW2d$Fn5b" role="3wpmZR">
-                <property role="2Vclpx" value="868.5" />
-                <property role="2Vclpz" value="90.5" />
+          <node concept="2VclrF" id="1a4oUCoMOoO" role="2Vcluh">
+            <property role="2Vclpx" value="1157.0" />
+            <property role="2Vclpz" value="187.0" />
+          </node>
+          <node concept="2VclrF" id="1a4oUCoMOoP" role="2Vcluh">
+            <property role="2Vclpx" value="1468.0" />
+            <property role="2Vclpz" value="187.0" />
+          </node>
+          <node concept="3ul5H1" id="1a4oUCoMOoQ" role="3ul5Gx">
+            <node concept="3wpmZ1" id="1a4oUCoMOoR" role="3ul5Gz">
+              <node concept="2VclrF" id="1a4oUCoMOoS" role="3wpmZR">
+                <property role="2Vclpx" value="0" />
+                <property role="2Vclpz" value="0" />
               </node>
-              <node concept="2VclrF" id="66sW2d$Fn5c" role="3wpmZP">
-                <property role="2Vclpx" value="0.0" />
-                <property role="2Vclpz" value="0.0" />
+              <node concept="2VclrF" id="1a4oUCoMOoT" role="3wpmZP">
+                <property role="2Vclpx" value="1758" />
+                <property role="2Vclpz" value="187" />
               </node>
             </node>
           </node>
-          <node concept="2VclrF" id="1QoXEbd_z6p" role="2Vcluh">
-            <property role="2Vclpx" value="538.9584760341179" />
-            <property role="2Vclpz" value="73.99999999997911" />
-          </node>
-          <node concept="2VclrF" id="1QoXEbd_z8C" role="2Vcluh">
-            <property role="2Vclpx" value="858.0015671902697" />
-            <property role="2Vclpz" value="73.99999999997911" />
-          </node>
         </node>
       </node>
       <node concept="37mRIm" id="66sW2d$Fn7j" role="37mRID">
@@ -4481,26 +4485,33 @@
       <node concept="37mRIm" id="2hOvri9UBIB" role="37mRID">
         <property role="37mO49" value="2626862697025272648" />
         <node concept="gqqVs" id="2hOvri9UBIA" role="37mO4d">
-          <property role="gqqTZ" value="779.0" />
-          <property role="gqqTW" value="446.0" />
-          <property role="gqqTX" value="208.0" />
-          <property role="gqqTy" value="123.0" />
+          <property role="gqqTZ" value="1216.0" />
+          <property role="gqqTW" value="456.0" />
+          <property role="gqqTX" value="257.0" />
+          <property role="gqqTy" value="50.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="2hOvri9UBQp" role="37mRID">
         <property role="37mO49" value="2626862697025273185" />
         <node concept="2VclpC" id="2hOvri9UBQo" role="37mO4d">
-          <node concept="3ul5H1" id="2hOvri9UBQq" role="3ul5Gx">
-            <property role="3ul5GH" value="label" />
-            <node concept="3wpmZ1" id="2hOvri9UBQr" role="3ul5Gz">
-              <node concept="2VclrF" id="2hOvri9UBQs" role="3wpmZR">
-                <property role="2Vclpx" value="842.0" />
-                <property role="2Vclpz" value="413.25" />
+          <node concept="2VclrF" id="1a4oUCoMOp6" role="2Vcluh">
+            <property role="2Vclpx" value="1344.0" />
+            <property role="2Vclpz" value="426.0" />
+          </node>
+          <node concept="2VclrF" id="1a4oUCoMOp7" role="2Vcluh">
+            <property role="2Vclpx" value="1344.0" />
+            <property role="2Vclpz" value="426.0" />
+          </node>
+          <node concept="3ul5H1" id="1a4oUCoMOp8" role="3ul5Gx">
+            <node concept="3wpmZ1" id="1a4oUCoMOp9" role="3ul5Gz">
+              <node concept="2VclrF" id="1a4oUCoMOpa" role="3wpmZR">
+                <property role="2Vclpx" value="0" />
+                <property role="2Vclpz" value="0" />
               </node>
-              <node concept="2VclrF" id="2hOvri9UBQt" role="3wpmZP">
-                <property role="2Vclpx" value="0.0" />
-                <property role="2Vclpz" value="0.0" />
+              <node concept="2VclrF" id="1a4oUCoMOpb" role="3wpmZP">
+                <property role="2Vclpx" value="1634" />
+                <property role="2Vclpz" value="426" />
               </node>
             </node>
           </node>
@@ -4683,10 +4694,10 @@
       <node concept="37mRIm" id="1S7Fn2AJdke" role="37mRID">
         <property role="37mO49" value="2163888845320148129" />
         <node concept="gqqVs" id="1S7Fn2AJdkd" role="37mO4d">
-          <property role="gqqTZ" value="454.5" />
-          <property role="gqqTW" value="115.0" />
-          <property role="gqqTX" value="211.0" />
-          <property role="gqqTy" value="89.0" />
+          <property role="gqqTZ" value="749.0" />
+          <property role="gqqTW" value="217.0" />
+          <property role="gqqTX" value="301.0" />
+          <property role="gqqTy" value="69.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -4711,66 +4722,73 @@
       <node concept="37mRIm" id="3TSGpjyN$No" role="37mRID">
         <property role="37mO49" value="4501543080575257576" />
         <node concept="gqqVs" id="3TSGpjyN$Nn" role="37mO4d">
-          <property role="gqqTZ" value="169.0" />
-          <property role="gqqTW" value="333.0" />
-          <property role="gqqTX" value="203.0" />
-          <property role="gqqTy" value="55.0" />
+          <property role="gqqTZ" value="50.0" />
+          <property role="gqqTW" value="365.0" />
+          <property role="gqqTX" value="241.0" />
+          <property role="gqqTy" value="69.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="3TSGpjyN$Nq" role="37mRID">
         <property role="37mO49" value="4501543080575257582" />
         <node concept="gqqVs" id="3TSGpjyN$Np" role="37mO4d">
-          <property role="gqqTZ" value="495.0" />
-          <property role="gqqTW" value="249.0" />
-          <property role="gqqTX" value="215.0" />
-          <property role="gqqTy" value="69.0" />
+          <property role="gqqTZ" value="321.0" />
+          <property role="gqqTW" value="365.0" />
+          <property role="gqqTX" value="253.0" />
+          <property role="gqqTy" value="88.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="3TSGpjyN$Ns" role="37mRID">
         <property role="37mO49" value="4501543080575257589" />
         <node concept="gqqVs" id="3TSGpjyN$Nr" role="37mO4d">
-          <property role="gqqTZ" value="240.0" />
-          <property role="gqqTW" value="255.5" />
-          <property role="gqqTX" value="246.0" />
-          <property role="gqqTy" value="55.0" />
+          <property role="gqqTZ" value="868.0" />
+          <property role="gqqTW" value="365.0" />
+          <property role="gqqTX" value="227.0" />
+          <property role="gqqTy" value="88.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="3TSGpjyN$Nu" role="37mRID">
         <property role="37mO49" value="4501543080575257595" />
         <node concept="gqqVs" id="3TSGpjyN$Nt" role="37mO4d">
-          <property role="gqqTZ" value="11.0" />
-          <property role="gqqTW" value="249.0" />
-          <property role="gqqTX" value="203.0" />
-          <property role="gqqTy" value="69.0" />
+          <property role="gqqTZ" value="604.0" />
+          <property role="gqqTW" value="365.0" />
+          <property role="gqqTX" value="234.0" />
+          <property role="gqqTy" value="88.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="3TSGpjyN$Nw" role="37mRID">
         <property role="37mO49" value="4501543080575257571" />
         <node concept="gqqVs" id="3TSGpjyN$Nv" role="37mO4d">
-          <property role="gqqTZ" value="81.0" />
-          <property role="gqqTW" value="115.0" />
-          <property role="gqqTX" value="285.0" />
-          <property role="gqqTy" value="83.0" />
+          <property role="gqqTZ" value="445.0" />
+          <property role="gqqTW" value="217.0" />
+          <property role="gqqTX" value="254.0" />
+          <property role="gqqTy" value="88.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="3TSGpjyN$Ny" role="37mRID">
         <property role="37mO49" value="4501543080575257581" />
         <node concept="2VclpC" id="3TSGpjyN$Nx" role="37mO4d">
-          <node concept="3ul5H1" id="3TSGpjyN$Nz" role="3ul5Gx">
-            <property role="3ul5GH" value="label" />
-            <node concept="3wpmZ1" id="3TSGpjyN$N$" role="3ul5Gz">
-              <node concept="2VclrF" id="3TSGpjyN$N_" role="3wpmZR">
-                <property role="2Vclpx" value="228.0" />
-                <property role="2Vclpz" value="316.0" />
+          <node concept="2VclrF" id="1a4oUCoMOos" role="2Vcluh">
+            <property role="2Vclpx" value="572" />
+            <property role="2Vclpz" value="335" />
+          </node>
+          <node concept="2VclrF" id="1a4oUCoMOot" role="2Vcluh">
+            <property role="2Vclpx" value="170" />
+            <property role="2Vclpz" value="335" />
+          </node>
+          <node concept="3ul5H1" id="1a4oUCoMOou" role="3ul5Gx">
+            <node concept="3wpmZ1" id="1a4oUCoMOov" role="3ul5Gz">
+              <node concept="2VclrF" id="1a4oUCoMOow" role="3wpmZR">
+                <property role="2Vclpx" value="0" />
+                <property role="2Vclpz" value="0" />
               </node>
-              <node concept="2VclrF" id="3TSGpjyN$NA" role="3wpmZP">
-                <property role="2Vclpx" value="0.0" />
-                <property role="2Vclpz" value="0.0" />
+              <node concept="2VclrF" id="1a4oUCoMOox" role="3wpmZP">
+                <property role="2Vclpx" value="170" />
+                <property role="2Vclpz" value="335" />
               </node>
             </node>
           </node>
@@ -4779,27 +4797,26 @@
       <node concept="37mRIm" id="3TSGpjyN$NC" role="37mRID">
         <property role="37mO49" value="4501543080575257588" />
         <node concept="2VclpC" id="3TSGpjyN$NB" role="37mO4d">
-          <node concept="3ul5H1" id="3TSGpjyN$ND" role="3ul5Gx">
-            <property role="3ul5GH" value="label" />
-            <node concept="3wpmZ1" id="3TSGpjyN$NE" role="3ul5Gz">
-              <node concept="2VclrF" id="3TSGpjyN$NF" role="3wpmZR">
-                <property role="2Vclpx" value="634.0" />
-                <property role="2Vclpz" value="216.0" />
+          <node concept="2VclrF" id="1a4oUCoMOoy" role="2Vcluh">
+            <property role="2Vclpx" value="572" />
+            <property role="2Vclpz" value="335" />
+          </node>
+          <node concept="2VclrF" id="1a4oUCoMOoz" role="2Vcluh">
+            <property role="2Vclpx" value="447" />
+            <property role="2Vclpz" value="335" />
+          </node>
+          <node concept="3ul5H1" id="1a4oUCoMOo$" role="3ul5Gx">
+            <node concept="3wpmZ1" id="1a4oUCoMOo_" role="3ul5Gz">
+              <node concept="2VclrF" id="1a4oUCoMOoA" role="3wpmZR">
+                <property role="2Vclpx" value="0" />
+                <property role="2Vclpz" value="0" />
               </node>
-              <node concept="2VclrF" id="3TSGpjyN$NG" role="3wpmZP">
-                <property role="2Vclpx" value="0.0" />
-                <property role="2Vclpz" value="0.0" />
+              <node concept="2VclrF" id="1a4oUCoMOoB" role="3wpmZP">
+                <property role="2Vclpx" value="447" />
+                <property role="2Vclpz" value="335" />
               </node>
             </node>
           </node>
-          <node concept="2VclrF" id="3TSGpjyN_RP" role="2Vcluh">
-            <property role="2Vclpx" value="224.0" />
-            <property role="2Vclpz" value="217.0" />
-          </node>
-          <node concept="2VclrF" id="3TSGpjyN_ST" role="2Vcluh">
-            <property role="2Vclpx" value="616.0204076320517" />
-            <property role="2Vclpz" value="217.0" />
-          </node>
         </node>
       </node>
       <node concept="37mRIm" id="3TSGpjyN$NI" role="37mRID">
@@ -4831,46 +4848,48 @@
       <node concept="37mRIm" id="3TSGpjyN$NO" role="37mRID">
         <property role="37mO49" value="4501543080575257600" />
         <node concept="2VclpC" id="3TSGpjyN$NN" role="37mO4d">
-          <node concept="3ul5H1" id="3TSGpjyN$NP" role="3ul5Gx">
-            <property role="3ul5GH" value="label" />
-            <node concept="3wpmZ1" id="3TSGpjyN$NQ" role="3ul5Gz">
-              <node concept="2VclrF" id="3TSGpjyN$NR" role="3wpmZR">
-                <property role="2Vclpx" value="47.0" />
-                <property role="2Vclpz" value="225.0" />
+          <node concept="2VclrF" id="1a4oUCoMOoC" role="2Vcluh">
+            <property role="2Vclpx" value="572" />
+            <property role="2Vclpz" value="335" />
+          </node>
+          <node concept="2VclrF" id="1a4oUCoMOoD" role="2Vcluh">
+            <property role="2Vclpx" value="721" />
+            <property role="2Vclpz" value="335" />
+          </node>
+          <node concept="3ul5H1" id="1a4oUCoMOoE" role="3ul5Gx">
+            <node concept="3wpmZ1" id="1a4oUCoMOoF" role="3ul5Gz">
+              <node concept="2VclrF" id="1a4oUCoMOoG" role="3wpmZR">
+                <property role="2Vclpx" value="0" />
+                <property role="2Vclpz" value="0" />
               </node>
-              <node concept="2VclrF" id="3TSGpjyN$NS" role="3wpmZP">
-                <property role="2Vclpx" value="0.0" />
-                <property role="2Vclpz" value="0.0" />
+              <node concept="2VclrF" id="1a4oUCoMOoH" role="3wpmZP">
+                <property role="2Vclpx" value="721" />
+                <property role="2Vclpz" value="335" />
               </node>
             </node>
           </node>
-          <node concept="2VclrF" id="3TSGpjyN_q$" role="2Vcluh">
-            <property role="2Vclpx" value="224.38869670610893" />
-            <property role="2Vclpz" value="198.0" />
-          </node>
-          <node concept="2VclrF" id="3TSGpjyN_rC" role="2Vcluh">
-            <property role="2Vclpx" value="224.38869670610893" />
-            <property role="2Vclpz" value="219.9901970205726" />
-          </node>
-          <node concept="2VclrF" id="3TSGpjyN_JH" role="2Vcluh">
-            <property role="2Vclpx" value="120.0" />
-            <property role="2Vclpz" value="219.9901970205726" />
-          </node>
         </node>
       </node>
       <node concept="37mRIm" id="3TSGpjyN_jM" role="37mRID">
         <property role="37mO49" value="4501543080575259757" />
         <node concept="2VclpC" id="3TSGpjyN_jL" role="37mO4d">
-          <node concept="3ul5H1" id="3TSGpjyN_jN" role="3ul5Gx">
-            <property role="3ul5GH" value="label" />
-            <node concept="3wpmZ1" id="3TSGpjyN_jO" role="3ul5Gz">
-              <node concept="2VclrF" id="3TSGpjyN_jP" role="3wpmZR">
-                <property role="2Vclpx" value="360.0" />
-                <property role="2Vclpz" value="134.0" />
+          <node concept="2VclrF" id="1a4oUCoMOpc" role="2Vcluh">
+            <property role="2Vclpx" value="699" />
+            <property role="2Vclpz" value="261" />
+          </node>
+          <node concept="2VclrF" id="1a4oUCoMOpd" role="2Vcluh">
+            <property role="2Vclpx" value="749" />
+            <property role="2Vclpz" value="251" />
+          </node>
+          <node concept="3ul5H1" id="1a4oUCoMOpe" role="3ul5Gx">
+            <node concept="3wpmZ1" id="1a4oUCoMOpf" role="3ul5Gz">
+              <node concept="2VclrF" id="1a4oUCoMOpg" role="3wpmZR">
+                <property role="2Vclpx" value="0" />
+                <property role="2Vclpz" value="0" />
               </node>
-              <node concept="2VclrF" id="3TSGpjyN_jQ" role="3wpmZP">
-                <property role="2Vclpx" value="0.0" />
-                <property role="2Vclpz" value="0.0" />
+              <node concept="2VclrF" id="1a4oUCoMOph" role="3wpmZP">
+                <property role="2Vclpx" value="699" />
+                <property role="2Vclpz" value="261" />
               </node>
             </node>
           </node>
@@ -4879,57 +4898,51 @@
       <node concept="37mRIm" id="3TSGpjyNA7k" role="37mRID">
         <property role="37mO49" value="4501543080575263055" />
         <node concept="2VclpC" id="3TSGpjyNA7j" role="37mO4d">
-          <node concept="3ul5H1" id="3TSGpjyNA7l" role="3ul5Gx">
-            <property role="3ul5GH" value="label" />
-            <node concept="3wpmZ1" id="3TSGpjyNA7m" role="3ul5Gz">
-              <node concept="2VclrF" id="3TSGpjyNA7n" role="3wpmZR">
-                <property role="2Vclpx" value="356.5" />
-                <property role="2Vclpz" value="231.0" />
+          <node concept="2VclrF" id="1a4oUCoMOoI" role="2Vcluh">
+            <property role="2Vclpx" value="572" />
+            <property role="2Vclpz" value="335" />
+          </node>
+          <node concept="2VclrF" id="1a4oUCoMOoJ" role="2Vcluh">
+            <property role="2Vclpx" value="981" />
+            <property role="2Vclpz" value="335" />
+          </node>
+          <node concept="3ul5H1" id="1a4oUCoMOoK" role="3ul5Gx">
+            <node concept="3wpmZ1" id="1a4oUCoMOoL" role="3ul5Gz">
+              <node concept="2VclrF" id="1a4oUCoMOoM" role="3wpmZR">
+                <property role="2Vclpx" value="0" />
+                <property role="2Vclpz" value="0" />
               </node>
-              <node concept="2VclrF" id="3TSGpjyNA7o" role="3wpmZP">
-                <property role="2Vclpx" value="0.0" />
-                <property role="2Vclpz" value="0.0" />
+              <node concept="2VclrF" id="1a4oUCoMOoN" role="3wpmZP">
+                <property role="2Vclpx" value="981" />
+                <property role="2Vclpz" value="335" />
               </node>
             </node>
           </node>
-          <node concept="2VclrF" id="3TSGpjyNAcm" role="2Vcluh">
-            <property role="2Vclpx" value="221.65606367215585" />
-            <property role="2Vclpz" value="198.0" />
-          </node>
-          <node concept="2VclrF" id="3TSGpjyNAdq" role="2Vcluh">
-            <property role="2Vclpx" value="221.65606367215585" />
-            <property role="2Vclpz" value="216.34393632784415" />
-          </node>
-          <node concept="2VclrF" id="3TSGpjyNAfz" role="2Vcluh">
-            <property role="2Vclpx" value="352.0831339695303" />
-            <property role="2Vclpz" value="216.34393632784415" />
-          </node>
         </node>
       </node>
       <node concept="37mRIm" id="3TSGpjyNAiL" role="37mRID">
         <property role="37mO49" value="4501543080575263787" />
         <node concept="2VclpC" id="3TSGpjyNAiK" role="37mO4d">
-          <node concept="3ul5H1" id="3TSGpjyNAiM" role="3ul5Gx">
-            <property role="3ul5GH" value="label" />
-            <node concept="3wpmZ1" id="3TSGpjyNAiN" role="3ul5Gz">
-              <node concept="2VclrF" id="3TSGpjyNAiO" role="3wpmZR">
-                <property role="2Vclpx" value="208.5" />
-                <property role="2Vclpz" value="94.0" />
+          <node concept="2VclrF" id="1a4oUCoMOom" role="2Vcluh">
+            <property role="2Vclpx" value="1157" />
+            <property role="2Vclpz" value="187" />
+          </node>
+          <node concept="2VclrF" id="1a4oUCoMOon" role="2Vcluh">
+            <property role="2Vclpx" value="572" />
+            <property role="2Vclpz" value="187" />
+          </node>
+          <node concept="3ul5H1" id="1a4oUCoMOoo" role="3ul5Gx">
+            <node concept="3wpmZ1" id="1a4oUCoMOop" role="3ul5Gz">
+              <node concept="2VclrF" id="1a4oUCoMOoq" role="3wpmZR">
+                <property role="2Vclpx" value="0" />
+                <property role="2Vclpz" value="0" />
               </node>
-              <node concept="2VclrF" id="3TSGpjyNAiP" role="3wpmZP">
-                <property role="2Vclpx" value="0.0" />
-                <property role="2Vclpz" value="0.0" />
+              <node concept="2VclrF" id="1a4oUCoMOor" role="3wpmZP">
+                <property role="2Vclpx" value="572" />
+                <property role="2Vclpz" value="187" />
               </node>
             </node>
           </node>
-          <node concept="2VclrF" id="3TSGpjyNAnW" role="2Vcluh">
-            <property role="2Vclpx" value="539.0" />
-            <property role="2Vclpz" value="77.0" />
-          </node>
-          <node concept="2VclrF" id="3TSGpjyNAp0" role="2Vcluh">
-            <property role="2Vclpx" value="195.99854227715008" />
-            <property role="2Vclpz" value="77.0" />
-          </node>
         </node>
       </node>
     </node>
@@ -4958,26 +4971,50 @@
         </node>
       </node>
     </node>
-    <node concept="3VeUTF" id="66sW2d$FlU3" role="2vhqc$">
-      <ref role="3VeSjP" node="66sW2d$FleZ" resolve="Str2.3" />
-      <ref role="3VeSjQ" node="66sW2d$Fll5" resolve="G2.6" />
-    </node>
-    <node concept="3VeUTF" id="66sW2d$FlWv" role="2vhqc$">
-      <ref role="3VeSjP" node="66sW2d$FleZ" resolve="Str2.3" />
-      <ref role="3VeSjQ" node="66sW2d$Flns" resolve="G2.7" />
-    </node>
     <node concept="2vn7WC" id="66sW2d$FmUo" role="2vn1q5">
       <property role="TrG5h" value="G2.1" />
       <node concept="19SGf9" id="66sW2d$FmZH" role="2vnaTY">
-        <node concept="19SUe$" id="66sW2d$FmZI" role="19SJt6">
-          <property role="19SUeA" value="The residual risk associated with &#10;the identified system hazards &#10;has been reduced to an acceptable level" />
+        <node concept="19SUe$" id="1a4oUCoMO8v" role="19SJt6">
+          <property role="19SUeA" value="The residual risk associated&#10;with the identified system&#10;hazards has been reduced to&#10;an acceptable level" />
         </node>
       </node>
     </node>
+    <node concept="3VeUTF" id="3TSGpjyNAgF" role="2vhqc$">
+      <ref role="3VeSjP" node="66sW2d$FmUo" resolve="G2.1" />
+      <ref role="3VeSjQ" node="3TSGpjyN$Jz" resolve="S01" />
+    </node>
+    <node concept="8gDHL" id="3TSGpjyN$JH" role="2vhqc$">
+      <ref role="3VeSjP" node="3TSGpjyN$Jz" resolve="S01" />
+      <ref role="3VeSjQ" node="3TSGpjyN$JC" resolve="MITIG_HAZ_01" />
+    </node>
+    <node concept="8gDHL" id="3TSGpjyN$JO" role="2vhqc$">
+      <ref role="3VeSjP" node="3TSGpjyN$Jz" resolve="S01" />
+      <ref role="3VeSjQ" node="3TSGpjyN$JI" resolve="DUBST_HAZ_01" />
+    </node>
+    <node concept="8gDHL" id="3TSGpjyN$K0" role="2vhqc$">
+      <ref role="3VeSjP" node="3TSGpjyN$Jz" resolve="S01" />
+      <ref role="3VeSjQ" node="3TSGpjyN$JV" resolve="ELIM_HAZ_01" />
+    </node>
+    <node concept="2vhqFZ" id="3TSGpjyN_hH" role="2vhqc$">
+      <ref role="3VeSjP" node="3TSGpjyN$Jz" resolve="S01" />
+      <ref role="3VeSjQ" node="1S7Fn2AJdix" resolve="A2" />
+    </node>
+    <node concept="8gDHL" id="3TSGpjyNA5f" role="2vhqc$">
+      <ref role="3VeSjP" node="3TSGpjyN$Jz" resolve="S01" />
+      <ref role="3VeSjQ" node="3TSGpjyN$JP" resolve="NEG_HAZ_01" />
+    </node>
     <node concept="3VeUTF" id="66sW2d$Fn4h" role="2vhqc$">
       <ref role="3VeSjP" node="66sW2d$FmUo" resolve="G2.1" />
       <ref role="3VeSjQ" node="66sW2d$FleZ" resolve="Str2.3" />
     </node>
+    <node concept="3VeUTF" id="66sW2d$FlU3" role="2vhqc$">
+      <ref role="3VeSjP" node="66sW2d$FleZ" resolve="Str2.3" />
+      <ref role="3VeSjQ" node="66sW2d$Fll5" resolve="G2.6" />
+    </node>
+    <node concept="3VeUTF" id="66sW2d$FlWv" role="2vhqc$">
+      <ref role="3VeSjP" node="66sW2d$FleZ" resolve="Str2.3" />
+      <ref role="3VeSjQ" node="66sW2d$Flns" resolve="G2.7" />
+    </node>
     <node concept="3t1IcU" id="2hOvri9UBH8" role="2vn1q5">
       <property role="TrG5h" value="Sn2" />
       <node concept="K87gv" id="2hOvri9UBWX" role="3t1IcV" />
@@ -5001,6 +5038,7 @@
     </node>
     <node concept="8gVzV" id="3TSGpjyN$JC" role="2vn1q5">
       <property role="8uqrb" value="true" />
+      <property role="TrG5h" value="MITIG_HAZ_01" />
       <node concept="19SGf9" id="3TSGpjyN$JD" role="2vnaTY">
         <node concept="19SUe$" id="3TSGpjyN$JE" role="19SJt6">
           <property role="19SUeA" value="Hazard " />
@@ -5011,12 +5049,9 @@
         </node>
       </node>
     </node>
-    <node concept="8gDHL" id="3TSGpjyN$JH" role="2vhqc$">
-      <ref role="3VeSjP" node="3TSGpjyN$Jz" />
-      <ref role="3VeSjQ" node="3TSGpjyN$JC" />
-    </node>
     <node concept="atrou" id="3TSGpjyN$JI" role="2vn1q5">
       <property role="8uqrb" value="true" />
+      <property role="TrG5h" value="DUBST_HAZ_01" />
       <node concept="19SGf9" id="3TSGpjyN$JJ" role="2vnaTY">
         <node concept="19SUe$" id="3TSGpjyN$JK" role="19SJt6">
           <property role="19SUeA" value="Hazard " />
@@ -5029,24 +5064,22 @@
         <node concept="19SUe$" id="1dsoBXVNuPv" role="19SJt6" />
       </node>
     </node>
-    <node concept="8gDHL" id="3TSGpjyN$JO" role="2vhqc$">
-      <ref role="3VeSjP" node="3TSGpjyN$Jz" />
-      <ref role="3VeSjQ" node="3TSGpjyN$JI" />
-    </node>
     <node concept="atroE" id="3TSGpjyN$JP" role="2vn1q5">
       <property role="8uqrb" value="true" />
+      <property role="TrG5h" value="NEG_HAZ_01" />
       <node concept="19SGf9" id="3TSGpjyN$JQ" role="2vnaTY">
         <node concept="19SUe$" id="3TSGpjyN$JR" role="19SJt6">
-          <property role="19SUeA" value="Risk associated with hazard " />
+          <property role="19SUeA" value="Risk associated with hazard &#10;" />
         </node>
         <node concept="oY6sn" id="1dsoBXVNuJs" role="19SJt6" />
         <node concept="19SUe$" id="1dsoBXVNuJt" role="19SJt6">
-          <property role="19SUeA" value="&#10; has been shown negligible" />
+          <property role="19SUeA" value=" has been &#10;shown negligible" />
         </node>
       </node>
     </node>
     <node concept="atroF" id="3TSGpjyN$JV" role="2vn1q5">
       <property role="8uqrb" value="true" />
+      <property role="TrG5h" value="ELIM_HAZ_01" />
       <node concept="19SGf9" id="3TSGpjyN$JW" role="2vnaTY">
         <node concept="19SUe$" id="3TSGpjyN$JX" role="19SJt6">
           <property role="19SUeA" value="Hazard " />
@@ -5057,11 +5090,8 @@
         </node>
       </node>
     </node>
-    <node concept="8gDHL" id="3TSGpjyN$K0" role="2vhqc$">
-      <ref role="3VeSjP" node="3TSGpjyN$Jz" />
-      <ref role="3VeSjQ" node="3TSGpjyN$JV" />
-    </node>
     <node concept="FXfxu" id="3TSGpjyN$Jz" role="2vn1q5">
+      <property role="TrG5h" value="S01" />
       <node concept="19SGf9" id="3TSGpjyN$J$" role="2vnaTY">
         <node concept="19SUe$" id="3TSGpjyN$J_" role="19SJt6">
           <property role="19SUeA" value="All hazards from &#10;" />
@@ -5072,18 +5102,6 @@
         </node>
       </node>
     </node>
-    <node concept="2vhqFZ" id="3TSGpjyN_hH" role="2vhqc$">
-      <ref role="3VeSjP" node="3TSGpjyN$Jz" />
-      <ref role="3VeSjQ" node="1S7Fn2AJdix" resolve="A2" />
-    </node>
-    <node concept="8gDHL" id="3TSGpjyNA5f" role="2vhqc$">
-      <ref role="3VeSjP" node="3TSGpjyN$Jz" />
-      <ref role="3VeSjQ" node="3TSGpjyN$JP" />
-    </node>
-    <node concept="3VeUTF" id="3TSGpjyNAgF" role="2vhqc$">
-      <ref role="3VeSjP" node="66sW2d$FmUo" resolve="G2.1" />
-      <ref role="3VeSjQ" node="3TSGpjyN$Jz" />
-    </node>
   </node>
   <node concept="1VB52S" id="Zbnj3aOW4n">
     <property role="3GE5qa" value="ISO 26262 GSN Patterns" />
@@ -5100,9 +5118,9 @@
       <node concept="37mRIm" id="Zbnj3aOW6k" role="37mRID">
         <property role="37mO49" value="1138105794983870804" />
         <node concept="gqqVs" id="Zbnj3aOW6i" role="37mO4d">
-          <property role="gqqTZ" value="311.0" />
-          <property role="gqqTW" value="9.0" />
-          <property role="gqqTX" value="147.0" />
+          <property role="gqqTZ" value="168.0" />
+          <property role="gqqTW" value="50.0" />
+          <property role="gqqTX" value="152.0" />
           <property role="gqqTy" value="63.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
@@ -5110,9 +5128,9 @@
       <node concept="37mRIm" id="Zbnj3aOWbh" role="37mRID">
         <property role="37mO49" value="1138105794983871119" />
         <node concept="gqqVs" id="Zbnj3aOWbg" role="37mO4d">
-          <property role="gqqTZ" value="248.5" />
-          <property role="gqqTW" value="164.0" />
-          <property role="gqqTX" value="176.0" />
+          <property role="gqqTZ" value="-110.0" />
+          <property role="gqqTW" value="273.0" />
+          <property role="gqqTX" value="245.0" />
           <property role="gqqTy" value="80.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
@@ -5120,9 +5138,9 @@
       <node concept="37mRIm" id="Zbnj3aOWgg" role="37mRID">
         <property role="37mO49" value="1138105794983871435" />
         <node concept="gqqVs" id="Zbnj3aOWgf" role="37mO4d">
-          <property role="gqqTZ" value="449.0" />
-          <property role="gqqTW" value="164.0" />
-          <property role="gqqTX" value="176.0" />
+          <property role="gqqTZ" value="426.0" />
+          <property role="gqqTW" value="273.0" />
+          <property role="gqqTX" value="245.0" />
           <property role="gqqTy" value="80.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
@@ -5130,8 +5148,8 @@
       <node concept="37mRIm" id="Zbnj3aOWvD" role="37mRID">
         <property role="37mO49" value="1138105794983872417" />
         <node concept="gqqVs" id="Zbnj3aOWvC" role="37mO4d">
-          <property role="gqqTZ" value="-9.0" />
-          <property role="gqqTW" value="164.0" />
+          <property role="gqqTZ" value="-331.0" />
+          <property role="gqqTW" value="273.0" />
           <property role="gqqTX" value="169.0" />
           <property role="gqqTy" value="63.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
@@ -5140,8 +5158,8 @@
       <node concept="37mRIm" id="Zbnj3aOW_I" role="37mRID">
         <property role="37mO49" value="1138105794983872803" />
         <node concept="gqqVs" id="Zbnj3aOW_H" role="37mO4d">
-          <property role="gqqTZ" value="692.0" />
-          <property role="gqqTW" value="172.5" />
+          <property role="gqqTZ" value="204.0" />
+          <property role="gqqTW" value="281.5" />
           <property role="gqqTX" value="169.0" />
           <property role="gqqTy" value="63.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
@@ -5150,16 +5168,19 @@
       <node concept="37mRIm" id="Zbnj3aOWLh" role="37mRID">
         <property role="37mO49" value="1138105794983873554" />
         <node concept="2VclpC" id="Zbnj3aOWLg" role="37mO4d">
-          <node concept="3ul5H1" id="Zbnj3aOWLi" role="3ul5Gx">
-            <property role="3ul5GH" value="label" />
-            <node concept="3wpmZ1" id="Zbnj3aOWLj" role="3ul5Gz">
-              <node concept="2VclrF" id="Zbnj3aOWLk" role="3wpmZR">
-                <property role="2Vclpx" value="165.0" />
-                <property role="2Vclpz" value="178.0" />
+          <node concept="2VclrF" id="1a4oUCoMSYu" role="2Vcluh">
+            <property role="2Vclpx" value="-100.0" />
+            <property role="2Vclpz" value="304.0" />
+          </node>
+          <node concept="3ul5H1" id="1a4oUCoMSYw" role="3ul5Gx">
+            <node concept="3wpmZ1" id="1a4oUCoMSYx" role="3ul5Gz">
+              <node concept="2VclrF" id="1a4oUCoMSYy" role="3wpmZR">
+                <property role="2Vclpx" value="0" />
+                <property role="2Vclpz" value="0" />
               </node>
-              <node concept="2VclrF" id="Zbnj3aOWLl" role="3wpmZP">
-                <property role="2Vclpx" value="0.0" />
-                <property role="2Vclpz" value="0.0" />
+              <node concept="2VclrF" id="1a4oUCoMSYz" role="3wpmZP">
+                <property role="2Vclpx" value="50" />
+                <property role="2Vclpz" value="213" />
               </node>
             </node>
           </node>
@@ -5168,16 +5189,19 @@
       <node concept="37mRIm" id="Zbnj3aOWOG" role="37mRID">
         <property role="37mO49" value="1138105794983873772" />
         <node concept="2VclpC" id="Zbnj3aOWOF" role="37mO4d">
-          <node concept="3ul5H1" id="Zbnj3aOWOH" role="3ul5Gx">
-            <property role="3ul5GH" value="label" />
-            <node concept="3wpmZ1" id="Zbnj3aOWOI" role="3ul5Gz">
-              <node concept="2VclrF" id="Zbnj3aOWOJ" role="3wpmZR">
-                <property role="2Vclpx" value="621.75" />
-                <property role="2Vclpz" value="184.0" />
+          <node concept="2VclrF" id="1a4oUCoMSY$" role="2Vcluh">
+            <property role="2Vclpx" value="393.82295693444894" />
+            <property role="2Vclpz" value="308.680821310718" />
+          </node>
+          <node concept="3ul5H1" id="1a4oUCoMSYA" role="3ul5Gx">
+            <node concept="3wpmZ1" id="1a4oUCoMSYB" role="3ul5Gz">
+              <node concept="2VclrF" id="1a4oUCoMSYC" role="3wpmZR">
+                <property role="2Vclpx" value="0" />
+                <property role="2Vclpz" value="0" />
               </node>
-              <node concept="2VclrF" id="Zbnj3aOWOK" role="3wpmZP">
-                <property role="2Vclpx" value="0.0" />
-                <property role="2Vclpz" value="0.0" />
+              <node concept="2VclrF" id="1a4oUCoMSYD" role="3wpmZP">
+                <property role="2Vclpx" value="256" />
+                <property role="2Vclpz" value="213" />
               </node>
             </node>
           </node>
@@ -5186,8 +5210,8 @@
       <node concept="37mRIm" id="Zbnj3aOWTx" role="37mRID">
         <property role="37mO49" value="1138105794983874067" />
         <node concept="gqqVs" id="Zbnj3aOWTw" role="37mO4d">
-          <property role="gqqTZ" value="556.0" />
-          <property role="gqqTW" value="-19.0" />
+          <property role="gqqTZ" value="-126.0" />
+          <property role="gqqTW" value="4.0" />
           <property role="gqqTX" value="169.0" />
           <property role="gqqTy" value="63.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
@@ -5196,8 +5220,8 @@
       <node concept="37mRIm" id="Zbnj3aOWX2" role="37mRID">
         <property role="37mO49" value="1138105794983874291" />
         <node concept="gqqVs" id="Zbnj3aOWX1" role="37mO4d">
-          <property role="gqqTZ" value="556.0" />
-          <property role="gqqTW" value="62.0" />
+          <property role="gqqTZ" value="-126.0" />
+          <property role="gqqTW" value="87.0" />
           <property role="gqqTX" value="169.0" />
           <property role="gqqTy" value="63.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
@@ -5206,16 +5230,23 @@
       <node concept="37mRIm" id="Zbnj3aOX2o" role="37mRID">
         <property role="37mO49" value="1138105794983874647" />
         <node concept="2VclpC" id="Zbnj3aOX2n" role="37mO4d">
-          <node concept="3ul5H1" id="Zbnj3aOX2p" role="3ul5Gx">
-            <property role="3ul5GH" value="label" />
-            <node concept="3wpmZ1" id="Zbnj3aOX2q" role="3ul5Gz">
-              <node concept="2VclrF" id="Zbnj3aOX2r" role="3wpmZR">
-                <property role="2Vclpx" value="469.0" />
-                <property role="2Vclpz" value="22.5" />
+          <node concept="2VclrF" id="1a4oUCoMSYE" role="2Vcluh">
+            <property role="2Vclpx" value="168" />
+            <property role="2Vclpz" value="81" />
+          </node>
+          <node concept="2VclrF" id="1a4oUCoMSYF" role="2Vcluh">
+            <property role="2Vclpx" value="118" />
+            <property role="2Vclpz" value="41" />
+          </node>
+          <node concept="3ul5H1" id="1a4oUCoMSYG" role="3ul5Gx">
+            <node concept="3wpmZ1" id="1a4oUCoMSYH" role="3ul5Gz">
+              <node concept="2VclrF" id="1a4oUCoMSYI" role="3wpmZR">
+                <property role="2Vclpx" value="0" />
+                <property role="2Vclpz" value="0" />
               </node>
-              <node concept="2VclrF" id="Zbnj3aOX2s" role="3wpmZP">
-                <property role="2Vclpx" value="0.0" />
-                <property role="2Vclpz" value="0.0" />
+              <node concept="2VclrF" id="1a4oUCoMSYJ" role="3wpmZP">
+                <property role="2Vclpx" value="168" />
+                <property role="2Vclpz" value="81" />
               </node>
             </node>
           </node>
@@ -5224,67 +5255,80 @@
       <node concept="37mRIm" id="Zbnj3aOX59" role="37mRID">
         <property role="37mO49" value="1138105794983874823" />
         <node concept="2VclpC" id="Zbnj3aOX58" role="37mO4d">
-          <node concept="3ul5H1" id="Zbnj3aOX5a" role="3ul5Gx">
-            <property role="3ul5GH" value="label" />
-            <node concept="3wpmZ1" id="Zbnj3aOX5b" role="3ul5Gz">
-              <node concept="2VclrF" id="Zbnj3aOX5c" role="3wpmZR">
-                <property role="2Vclpx" value="470.0" />
-                <property role="2Vclpz" value="47.0" />
+          <node concept="2VclrF" id="1a4oUCoMSYK" role="2Vcluh">
+            <property role="2Vclpx" value="168.0" />
+            <property role="2Vclpz" value="81.0" />
+          </node>
+          <node concept="2VclrF" id="1a4oUCoMSYL" role="2Vcluh">
+            <property role="2Vclpx" value="118.0" />
+            <property role="2Vclpz" value="114.98276374290619" />
+          </node>
+          <node concept="3ul5H1" id="1a4oUCoMSYM" role="3ul5Gx">
+            <node concept="3wpmZ1" id="1a4oUCoMSYN" role="3ul5Gz">
+              <node concept="2VclrF" id="1a4oUCoMSYO" role="3wpmZR">
+                <property role="2Vclpx" value="0" />
+                <property role="2Vclpz" value="0" />
               </node>
-              <node concept="2VclrF" id="Zbnj3aOX5d" role="3wpmZP">
-                <property role="2Vclpx" value="0.0" />
-                <property role="2Vclpz" value="0.0" />
+              <node concept="2VclrF" id="1a4oUCoMSYP" role="3wpmZP">
+                <property role="2Vclpx" value="168" />
+                <property role="2Vclpz" value="81" />
               </node>
             </node>
           </node>
+          <node concept="2VclrF" id="1a4oUCoMUoD" role="2Vcluh">
+            <property role="2Vclpx" value="54.01743736405759" />
+            <property role="2Vclpz" value="125.6813949891246" />
+          </node>
         </node>
       </node>
       <node concept="37mRIm" id="Zbnj3aOXc5" role="37mRID">
         <property role="37mO49" value="1138105794983875266" />
         <node concept="2VclpC" id="Zbnj3aOXc4" role="37mO4d">
-          <node concept="3ul5H1" id="Zbnj3aOXc6" role="3ul5Gx">
-            <property role="3ul5GH" value="label" />
-            <node concept="3wpmZ1" id="Zbnj3aOXc7" role="3ul5Gz">
-              <node concept="2VclrF" id="Zbnj3aOXc8" role="3wpmZR">
-                <property role="2Vclpx" value="294.0" />
-                <property role="2Vclpz" value="137.25" />
+          <node concept="2VclrF" id="1a4oUCoMSYi" role="2Vcluh">
+            <property role="2Vclpx" value="241.0" />
+            <property role="2Vclpz" value="143.0" />
+          </node>
+          <node concept="2VclrF" id="1a4oUCoMSYj" role="2Vcluh">
+            <property role="2Vclpx" value="64.89049309426304" />
+            <property role="2Vclpz" value="143.0" />
+          </node>
+          <node concept="3ul5H1" id="1a4oUCoMSYk" role="3ul5Gx">
+            <node concept="3wpmZ1" id="1a4oUCoMSYl" role="3ul5Gz">
+              <node concept="2VclrF" id="1a4oUCoMSYm" role="3wpmZR">
+                <property role="2Vclpx" value="0" />
+                <property role="2Vclpz" value="0" />
               </node>
-              <node concept="2VclrF" id="Zbnj3aOXc9" role="3wpmZP">
-                <property role="2Vclpx" value="0.0" />
-                <property role="2Vclpz" value="0.0" />
+              <node concept="2VclrF" id="1a4oUCoMSYn" role="3wpmZP">
+                <property role="2Vclpx" value="138" />
+                <property role="2Vclpz" value="143" />
               </node>
             </node>
           </node>
-          <node concept="2VclrF" id="Zbnj3aOXg9" role="2Vcluh">
-            <property role="2Vclpx" value="375.0" />
-            <property role="2Vclpz" value="115.0" />
-          </node>
         </node>
       </node>
       <node concept="37mRIm" id="Zbnj3aOXe8" role="37mRID">
         <property role="37mO49" value="1138105794983875338" />
         <node concept="2VclpC" id="Zbnj3aOXe7" role="37mO4d">
-          <node concept="3ul5H1" id="Zbnj3aOXe9" role="3ul5Gx">
-            <property role="3ul5GH" value="label" />
-            <node concept="3wpmZ1" id="Zbnj3aOXea" role="3ul5Gz">
-              <node concept="2VclrF" id="Zbnj3aOXeb" role="3wpmZR">
-                <property role="2Vclpx" value="523.75" />
-                <property role="2Vclpz" value="139.25" />
+          <node concept="2VclrF" id="1a4oUCoMSYo" role="2Vcluh">
+            <property role="2Vclpx" value="241.0" />
+            <property role="2Vclpz" value="143.0" />
+          </node>
+          <node concept="2VclrF" id="1a4oUCoMSYp" role="2Vcluh">
+            <property role="2Vclpx" value="545.0065788761815" />
+            <property role="2Vclpz" value="143.0" />
+          </node>
+          <node concept="3ul5H1" id="1a4oUCoMSYq" role="3ul5Gx">
+            <node concept="3wpmZ1" id="1a4oUCoMSYr" role="3ul5Gz">
+              <node concept="2VclrF" id="1a4oUCoMSYs" role="3wpmZR">
+                <property role="2Vclpx" value="0" />
+                <property role="2Vclpz" value="0" />
               </node>
-              <node concept="2VclrF" id="Zbnj3aOXec" role="3wpmZP">
-                <property role="2Vclpx" value="0.0" />
-                <property role="2Vclpz" value="0.0" />
+              <node concept="2VclrF" id="1a4oUCoMSYt" role="3wpmZP">
+                <property role="2Vclpx" value="344" />
+                <property role="2Vclpz" value="143" />
               </node>
             </node>
           </node>
-          <node concept="2VclrF" id="Zbnj3aOXhd" role="2Vcluh">
-            <property role="2Vclpx" value="375.0" />
-            <property role="2Vclpz" value="115.0" />
-          </node>
-          <node concept="2VclrF" id="Zbnj3aOXih" role="2Vcluh">
-            <property role="2Vclpx" value="521.0547842420781" />
-            <property role="2Vclpz" value="115.0" />
-          </node>
         </node>
       </node>
     </node>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/com.mbeddr.formal.safety.gsn.sandbox.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/com.mbeddr.formal.safety.gsn.sandbox.msd
index a206ba853..bd790b265 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/com.mbeddr.formal.safety.gsn.sandbox.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/com.mbeddr.formal.safety.gsn.sandbox.msd
@@ -11,10 +11,7 @@
     </facet>
   </facets>
   <dependencies>
-    <dependency reexport="false">8ca79d43-eb45-4791-bdd4-0d6130ff895b(de.itemis.mps.editor.diagram.layout)</dependency>
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
-    <dependency reexport="false">0deccdfd-196b-4d8c-895e-0d6cb8014dfd(com.mbeddr.formal.req.base)</dependency>
-    <dependency reexport="false">434b2bfb-bd7a-47c9-bced-b445035e6d96(com.mbeddr.formal.safety.req)</dependency>
     <dependency reexport="false">17da266c-02d9-4bbd-b69b-8a656b49f45c(com.mbeddr.formal.safety.hara)</dependency>
     <dependency reexport="false">04d81d12-7048-4552-9a53-86a271c0f094(com.mbeddr.formal.safety.argument.visualisation)</dependency>
   </dependencies>
@@ -82,13 +79,10 @@
     <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="2" />
-    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <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:1a8554c4-eb84-43ba-8c34-6f0d90c6e75a:jetbrains.mps.lang.smodel.query" version="3" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
@@ -101,12 +95,10 @@
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="e1b41d7d-269e-4a91-a7d8-91bd657028d7(com.fasten.safety.doc2word)" version="0" />
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
-    <module reference="0deccdfd-196b-4d8c-895e-0d6cb8014dfd(com.mbeddr.formal.req.base)" version="0" />
     <module reference="04d81d12-7048-4552-9a53-86a271c0f094(com.mbeddr.formal.safety.argument.visualisation)" version="0" />
     <module reference="e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)" version="0" />
     <module reference="4405c79a-2cec-40b3-b09e-a2a5fd99a7f6(com.mbeddr.formal.safety.gsn.sandbox)" version="0" />
     <module reference="17da266c-02d9-4bbd-b69b-8a656b49f45c(com.mbeddr.formal.safety.hara)" version="0" />
-    <module reference="434b2bfb-bd7a-47c9-bced-b445035e6d96(com.mbeddr.formal.safety.req)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="7b45fa94-2707-4a1a-9e6a-ce40c4aaf35a(de.itemis.mps.editor.collapsible.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._200_gsn_patterns.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._200_gsn_patterns.mps
index cce1426ea..99a15a5f9 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._200_gsn_patterns.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._200_gsn_patterns.mps
@@ -4,16 +4,12 @@
   <languages>
     <use id="0deccdfd-196b-4d8c-895e-0d6cb8014dfd" name="com.mbeddr.formal.req.base" version="0" />
     <use id="e8a04d94-4307-4f88-95a2-25f7c4f39437" name="com.mbeddr.formal.safety.gsn" version="3" />
-    <use id="7f3eac5a-7f9a-4fbe-8264-f69c70ece985" name="com.mbeddr.formal.safety.gsn.smv" version="9" />
     <use id="001b2375-3bd5-4d5e-9958-6b3f62dc8548" name="com.mbeddr.formal.nusmv" version="0" />
     <use id="b0b65429-cd22-4e2a-83e7-cd58bc6dd72f" name="com.mbeddr.formal.base.expressions" version="0" />
-    <use id="cac6875e-14fd-4552-a69e-b3168e27e2ff" name="com.mbeddr.formal.nusmv.tests" version="0" />
-    <use id="22a84bd5-d947-48ae-b9f6-8288eea41dce" name="com.mbeddr.formal.nusmv.arch" version="0" />
     <use id="8ca79d43-eb45-4791-bdd4-0d6130ff895b" name="de.itemis.mps.editor.diagram.layout" version="0" />
     <use id="f465db4c-63d4-40ef-afda-acd713dc19a1" name="com.mbeddr.formal.safety.gsn.patterns" version="0" />
     <use id="17da266c-02d9-4bbd-b69b-8a656b49f45c" name="com.mbeddr.formal.safety.hara" version="0" />
     <use id="58bd9c99-ba42-4205-b3c9-ce445fd870e6" name="com.mbeddr.formal.nusmv.cbd" version="1" />
-    <use id="434b2bfb-bd7a-47c9-bced-b445035e6d96" name="com.mbeddr.formal.safety.req" version="1" />
     <use id="71797868-de95-425c-8470-36aa52c8ebc4" name="com.mbeddr.formal.base.arch" version="1" />
     <devkit ref="b0ef168f-6f92-4bd0-82f3-cf0521463683(fasten.requirements)" />
   </languages>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._300_gsn_odd.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._300_gsn_odd.mps
index 0a261066b..4625db2aa 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._300_gsn_odd.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._300_gsn_odd.mps
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <model ref="r:837af7c8-dec7-4027-a07b-1afaeb1d64f3(com.mbeddr.formal.safety.gsn.sandbox._300_gsn_odd)">
   <persistence version="9" />
+  <attribute name="doNotGenerate" value="true" />
   <languages>
     <use id="0deccdfd-196b-4d8c-895e-0d6cb8014dfd" name="com.mbeddr.formal.req.base" version="0" />
     <use id="e8a04d94-4307-4f88-95a2-25f7c4f39437" name="com.mbeddr.formal.safety.gsn" version="3" />
-    <use id="7f3eac5a-7f9a-4fbe-8264-f69c70ece985" name="com.mbeddr.formal.safety.gsn.smv" version="9" />
     <use id="001b2375-3bd5-4d5e-9958-6b3f62dc8548" name="com.mbeddr.formal.nusmv" version="0" />
     <use id="b0b65429-cd22-4e2a-83e7-cd58bc6dd72f" name="com.mbeddr.formal.base.expressions" version="0" />
-    <use id="cac6875e-14fd-4552-a69e-b3168e27e2ff" name="com.mbeddr.formal.nusmv.tests" version="0" />
     <use id="22a84bd5-d947-48ae-b9f6-8288eea41dce" name="com.mbeddr.formal.nusmv.arch" version="0" />
     <use id="8ca79d43-eb45-4791-bdd4-0d6130ff895b" name="de.itemis.mps.editor.diagram.layout" version="0" />
     <use id="8c301636-fbda-4009-bce8-7e00c3c1bac5" name="com.mbeddr.formal.safety.gsn.odd" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._600_gsn_modelquery.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._600_gsn_modelquery.mps
index 5cff05396..d16d97261 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._600_gsn_modelquery.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._600_gsn_modelquery.mps
@@ -3,10 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="57ecebe4-dfb8-4fef-9175-0008e04a3684" name="com.mbeddr.formal.safety.argument.modelquery" version="-1" />
-    <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
-    <use id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query" version="3" />
     <devkit ref="b64463ba-ae31-4cf7-be7b-afc13cab4daa(fasten.safety.gsn)" />
     <devkit ref="7466bc49-e775-4df7-a9f3-e383173b2eee(fasten.safety.gsn.ext)" />
     <devkit ref="3970a543-1808-4b9f-a378-71f15d96d819(fasten.safety.hara)" />
@@ -15,8 +12,6 @@
   </languages>
   <imports>
     <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
-    <import index="z27p" ref="r:9796df7f-5d01-4a46-b1e4-58be8e3ac472(com.mbeddr.formal.req.base.structure)" />
-    <import index="30zx" ref="r:c74e2282-8641-453d-b9cc-e065e14a0117(com.mbeddr.formal.safety.req.structure)" />
     <import index="cjwq" ref="r:7e1f4da1-19b3-4ceb-bcab-0237eb7a50b7(com.mbeddr.formal.safety.hara.structure)" />
     <import index="89jy" ref="r:b084f3b4-d6a1-4460-8222-b4a956bb5d23(com.mbeddr.formal.safety.gsn.behavior)" implicit="true" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" implicit="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/com.mbeddr.formal.safety.gsn.smv.pluginSolution.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/com.mbeddr.formal.safety.gsn.smv.pluginSolution.msd
index 820bcc03c..a1d7441e6 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/com.mbeddr.formal.safety.gsn.smv.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/com.mbeddr.formal.safety.gsn.smv.pluginSolution.msd
@@ -23,7 +23,6 @@
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
     <dependency reexport="false">7f3eac5a-7f9a-4fbe-8264-f69c70ece985(com.mbeddr.formal.safety.gsn.smv)</dependency>
     <dependency reexport="false">cac6875e-14fd-4552-a69e-b3168e27e2ff(com.mbeddr.formal.nusmv.tests)</dependency>
-    <dependency reexport="false">b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
   </dependencies>
   <languageVersions>
@@ -33,7 +32,6 @@
     <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="2" />
     <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:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
@@ -59,7 +57,6 @@
     <module reference="692c2a6d-09c5-40f7-98f0-1f4b59860c1b(com.mbeddr.formal.nusmv.pluginSolution)" version="0" />
     <module reference="cac6875e-14fd-4552-a69e-b3168e27e2ff(com.mbeddr.formal.nusmv.tests)" 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="7f3eac5a-7f9a-4fbe-8264-f69c70ece985(com.mbeddr.formal.safety.gsn.smv)" version="8" />
     <module reference="7deddb2c-6152-400d-b886-3520afdc89b1(com.mbeddr.formal.safety.gsn.smv.pluginSolution)" version="0" />
     <module reference="6c88fcd1-5552-4d29-9f1b-f00bd84dd40e(com.mbeddr.mpsutil.genreview)" version="0" />
@@ -77,7 +74,6 @@
     <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" />
     <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.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/models/com.mbeddr.formal.safety.gsn.smv.pluginSolution.analyzers.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/models/com.mbeddr.formal.safety.gsn.smv.pluginSolution.analyzers.mps
index 409deccbc..81c82bdb2 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/models/com.mbeddr.formal.safety.gsn.smv.pluginSolution.analyzers.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/models/com.mbeddr.formal.safety.gsn.smv.pluginSolution.analyzers.mps
@@ -7,27 +7,21 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
-    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports>
-    <import index="25x5" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.text(JDK/)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="bsp8" ref="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" />
-    <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="tiyw" ref="r:79c46c2e-9224-40de-87d4-7f9a52478722(com.mbeddr.formal.safety.gsn.smv.behavior)" />
     <import index="gioj" ref="r:a6dee7e9-c79f-4293-b631-7c366a8877df(com.mbeddr.formal.nusmv.structure)" />
     <import index="fnq2" ref="r:412c918d-151c-45fe-acf3-0268d0d563c1(com.mbeddr.formal.nusmv.tests.structure)" />
     <import index="4c75" ref="r:088add12-8a36-47c2-b0d2-7180a8a2a891(com.mbeddr.formal.nusmv.pluginSolution.runner)" />
-    <import index="4nm9" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.project(MPS.IDEA/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="2ocj" ref="r:0af55dc0-14f5-45c8-bf12-3c673ca075ac(com.mbeddr.formal.base.tooling.analyzer)" />
     <import index="xygl" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.progress(MPS.IDEA/)" />
     <import index="2avh" ref="r:d71bd9ec-2dae-496f-9887-8fb9facf61b7(com.mbeddr.formal.base.tooling.tools)" />
-    <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
     <import index="kldk" ref="r:9beacef3-7901-4618-b268-83e1ff474c32(com.mbeddr.formal.nusmv.pluginSolution.utils)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
-    <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
     <import index="89jy" ref="r:b084f3b4-d6a1-4460-8222-b4a956bb5d23(com.mbeddr.formal.safety.gsn.behavior)" implicit="true" />
   </imports>
   <registry>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/models/com.mbeddr.formal.safety.gsn.smv.pluginSolution.plugin.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/models/com.mbeddr.formal.safety.gsn.smv.pluginSolution.plugin.mps
index d3f7ed41d..cd1087953 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/models/com.mbeddr.formal.safety.gsn.smv.pluginSolution.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/models/com.mbeddr.formal.safety.gsn.smv.pluginSolution.plugin.mps
@@ -7,13 +7,10 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
-    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <imports>
-    <import index="qkt" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.actionSystem(MPS.IDEA/)" />
     <import index="fhlc" ref="r:89fb4363-ec36-4a06-ac51-b284d265c631(com.mbeddr.formal.base.tooling.make)" />
     <import index="reb8" ref="r:c064a266-9199-4619-9d01-bcf72fc239bc(com.mbeddr.formal.nusmv.pluginSolution.plugin)" />
     <import index="gioj" ref="r:a6dee7e9-c79f-4293-b631-7c366a8877df(com.mbeddr.formal.nusmv.structure)" />
@@ -24,7 +21,6 @@
     <import index="2ocj" ref="r:0af55dc0-14f5-45c8-bf12-3c673ca075ac(com.mbeddr.formal.base.tooling.analyzer)" />
     <import index="z1c4" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
-    <import index="alof" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.project(MPS.Platform/)" />
     <import index="8js5" ref="r:896eeadf-a850-400e-b516-f92dfb5b5cd9(com.mbeddr.formal.base.pluginSolution.plugin)" />
     <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
     <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
@@ -34,9 +30,7 @@
     <import index="25x5" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.text(JDK/)" />
     <import index="fnq2" ref="r:412c918d-151c-45fe-acf3-0268d0d563c1(com.mbeddr.formal.nusmv.tests.structure)" />
     <import index="tiyw" ref="r:79c46c2e-9224-40de-87d4-7f9a52478722(com.mbeddr.formal.safety.gsn.smv.behavior)" />
-    <import index="qt06" ref="b0f8641f-bd77-4421-8425-30d9088a82f7/java:org.apache.commons.lang3.builder(org.apache.commons/)" />
     <import index="xy37" ref="r:186b413f-9752-4da9-a476-351651745753(com.mbeddr.formal.safety.gsn.smv.pluginSolution.analyzers)" />
-    <import index="tprs" ref="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)" />
     <import index="qq03" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.actions(MPS.Platform/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="89jy" ref="r:b084f3b4-d6a1-4460-8222-b4a956bb5d23(com.mbeddr.formal.safety.gsn.behavior)" implicit="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.spin.pluginSolution/com.mbeddr.formal.safety.gsn.spin.pluginSolution.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.spin.pluginSolution/com.mbeddr.formal.safety.gsn.spin.pluginSolution.msd
index 0b8d13976..d0bde5f07 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.spin.pluginSolution/com.mbeddr.formal.safety.gsn.spin.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.spin.pluginSolution/com.mbeddr.formal.safety.gsn.spin.pluginSolution.msd
@@ -11,7 +11,6 @@
     </facet>
   </facets>
   <dependencies>
-    <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">945808cb-09a0-4d70-9f2a-186b7f5c6219(com.mbeddr.formal.base.pluginSolution)</dependency>
@@ -25,7 +24,6 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <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="2" />
-    <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.spin.pluginSolution/models/com.mbeddr.formal.safety.gsn.spin.pluginSolution.plugin.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.spin.pluginSolution/models/com.mbeddr.formal.safety.gsn.spin.pluginSolution.plugin.mps
index 40d900951..13aea61ad 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.spin.pluginSolution/models/com.mbeddr.formal.safety.gsn.spin.pluginSolution.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.spin.pluginSolution/models/com.mbeddr.formal.safety.gsn.spin.pluginSolution.plugin.mps
@@ -6,16 +6,12 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
-    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
   </languages>
   <imports>
-    <import index="25x5" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.text(JDK/)" />
     <import index="qkt" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.actionSystem(MPS.IDEA/)" />
     <import index="4nm9" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.project(MPS.IDEA/)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
-    <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="8js5" ref="r:896eeadf-a850-400e-b516-f92dfb5b5cd9(com.mbeddr.formal.base.pluginSolution.plugin)" />
     <import index="z4ol" ref="r:a03a882e-be67-46a6-adb2-41cedc56b233(com.mbeddr.formal.safety.gsn.odd.structure)" />
     <import index="gie1" ref="r:5078867a-a960-481e-b2ca-bd2799992b5a(com.mbeddr.formal.spin.pluginSolution.plugin)" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/com.mbeddr.formal.safety.gsn.web.rt.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/com.mbeddr.formal.safety.gsn.web.rt.msd
index ab47f49b8..ace0420b5 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/com.mbeddr.formal.safety.gsn.web.rt.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/com.mbeddr.formal.safety.gsn.web.rt.msd
@@ -41,8 +41,6 @@
     <language slang="l:817e4e70-961e-4a95-98a1-15e9f32231f1:jetbrains.mps.ide.httpsupport" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" 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:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
     <language slang="l:7ab1a6fa-0a11-4b95-9e48-75f363d6cb00:jetbrains.mps.lang.generator.plan" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/models/com.mbeddr.formal.safety.gsn.web.rt.plugin.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/models/com.mbeddr.formal.safety.gsn.web.rt.plugin.mps
index 9daaa7475..656917e6f 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/models/com.mbeddr.formal.safety.gsn.web.rt.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/models/com.mbeddr.formal.safety.gsn.web.rt.plugin.mps
@@ -4,9 +4,7 @@
   <languages>
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
-    <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
-    <use id="289fcc83-6543-41e8-a5ca-768235715ce4" name="jetbrains.mps.lang.generator.generationParameters" version="0" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="817e4e70-961e-4a95-98a1-15e9f32231f1" name="jetbrains.mps.ide.httpsupport" version="0" />
@@ -32,7 +30,6 @@
     <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
     <import index="6w1g" ref="r:e3e42643-2e12-4fcc-8002-d27a9b589141(com.mbeddr.formal.safety.gsn.web.rt.genutil)" />
     <import index="qq03" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.actions(MPS.Platform/)" />
-    <import index="qkt" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.actionSystem(MPS.IDEA/)" />
     <import index="w2i7" ref="r:b79595f7-8350-4c32-8b59-20629b485a08(com.mbeddr.formal.safety.gsn.web.rt.gsn_genplan)" />
     <import index="ra3w" ref="r:d160eea8-047c-42af-ab07-6b169eeb13fd(com.mbeddr.formal.safety.gsn.web.util)" />
     <import index="87nw" ref="r:ca2ab6bb-f6e7-4c0f-a88c-b78b9b31fff3(de.slisson.mps.richtext.structure)" />
@@ -284,6 +281,10 @@
         <child id="7400021826774799510" name="ref" index="2tJFKM" />
       </concept>
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
+      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
+        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
+      </concept>
       <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
       <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
         <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
@@ -295,6 +296,9 @@
       <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
         <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
       </concept>
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
+        <property id="1238684351431" name="asCast" index="1BlNFB" />
+      </concept>
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
@@ -421,8 +425,12 @@
             <node concept="3Tqbb2" id="kPkqqqMlJv" role="1tU5fm">
               <ref role="ehGHo" to="py52:3GRi4m$qNsQ" resolve="GoalStructure" />
             </node>
-            <node concept="10QFUN" id="kPkqqqMlML" role="33vP2m">
-              <node concept="2YIFZM" id="5pJnDA9exBe" role="10QFUP">
+            <node concept="1PxgMI" id="1a4oUCpOkFs" role="33vP2m">
+              <property role="1BlNFB" value="true" />
+              <node concept="chp4Y" id="1a4oUCpOkWS" role="3oSUPX">
+                <ref role="cht4Q" to="py52:3GRi4m$qNsQ" resolve="GoalStructure" />
+              </node>
+              <node concept="2YIFZM" id="5pJnDA9exBe" role="1m5AlR">
                 <ref role="37wK5l" node="4eRbb89BRvz" resolve="resolveNode" />
                 <ref role="1Pybhc" node="4eRbb89BzK0" resolve="SelectNodeUtil" />
                 <node concept="3_PKRz" id="5pJnDA9exBf" role="37wK5m">
@@ -432,9 +440,6 @@
                   <ref role="3_PKRw" node="kPkqqqM4Qn" resolve="node" />
                 </node>
               </node>
-              <node concept="3Tqbb2" id="kPkqqqMlMM" role="10QFUM">
-                <ref role="ehGHo" to="py52:3GRi4m$qNsQ" resolve="GoalStructure" />
-              </node>
             </node>
           </node>
         </node>
@@ -1096,8 +1101,12 @@
             <node concept="3Tqbb2" id="5pJnDA9hdRv" role="1tU5fm">
               <ref role="ehGHo" to="py52:3GRi4m$qNsQ" resolve="GoalStructure" />
             </node>
-            <node concept="10QFUN" id="5pJnDA9hdRw" role="33vP2m">
-              <node concept="2YIFZM" id="5pJnDA9hdRx" role="10QFUP">
+            <node concept="1PxgMI" id="1a4oUCpOgF3" role="33vP2m">
+              <property role="1BlNFB" value="true" />
+              <node concept="chp4Y" id="1a4oUCpOgM1" role="3oSUPX">
+                <ref role="cht4Q" to="py52:3GRi4m$qNsQ" resolve="GoalStructure" />
+              </node>
+              <node concept="2YIFZM" id="5pJnDA9hdRx" role="1m5AlR">
                 <ref role="1Pybhc" node="4eRbb89BzK0" resolve="SelectNodeUtil" />
                 <ref role="37wK5l" node="4eRbb89BRvz" resolve="resolveNode" />
                 <node concept="3_PKRz" id="5pJnDA9hdRy" role="37wK5m">
@@ -1107,9 +1116,6 @@
                   <ref role="3_PKRw" node="5pJnDA9hdRg" resolve="gsnNode" />
                 </node>
               </node>
-              <node concept="3Tqbb2" id="5pJnDA9hdR$" role="10QFUM">
-                <ref role="ehGHo" to="py52:3GRi4m$qNsQ" resolve="GoalStructure" />
-              </node>
             </node>
           </node>
         </node>
@@ -1302,8 +1308,12 @@
             <node concept="3Tqbb2" id="5pJnDA9j9ux" role="1tU5fm">
               <ref role="ehGHo" to="py52:3GRi4m$qNsQ" resolve="GoalStructure" />
             </node>
-            <node concept="10QFUN" id="5pJnDA9j9uy" role="33vP2m">
-              <node concept="2YIFZM" id="5pJnDA9j9uz" role="10QFUP">
+            <node concept="1PxgMI" id="1a4oUCpOrxh" role="33vP2m">
+              <property role="1BlNFB" value="true" />
+              <node concept="chp4Y" id="1a4oUCpOrEx" role="3oSUPX">
+                <ref role="cht4Q" to="py52:3GRi4m$qNsQ" resolve="GoalStructure" />
+              </node>
+              <node concept="2YIFZM" id="5pJnDA9j9uz" role="1m5AlR">
                 <ref role="37wK5l" node="4eRbb89BRvz" resolve="resolveNode" />
                 <ref role="1Pybhc" node="4eRbb89BzK0" resolve="SelectNodeUtil" />
                 <node concept="3_PKRz" id="5pJnDA9j9u$" role="37wK5m">
@@ -1313,9 +1323,6 @@
                   <ref role="3_PKRw" node="5pJnDA9j9uc" resolve="gsnNode" />
                 </node>
               </node>
-              <node concept="3Tqbb2" id="5pJnDA9j9uA" role="10QFUM">
-                <ref role="ehGHo" to="py52:3GRi4m$qNsQ" resolve="GoalStructure" />
-              </node>
             </node>
           </node>
         </node>
@@ -1640,8 +1647,12 @@
             <node concept="3Tqbb2" id="5pJnDA9ktAD" role="1tU5fm">
               <ref role="ehGHo" to="py52:3GRi4m$qNsQ" resolve="GoalStructure" />
             </node>
-            <node concept="10QFUN" id="5pJnDA9ktAE" role="33vP2m">
-              <node concept="2YIFZM" id="5pJnDA9ktAF" role="10QFUP">
+            <node concept="1PxgMI" id="1a4oUCpOou9" role="33vP2m">
+              <property role="1BlNFB" value="true" />
+              <node concept="chp4Y" id="1a4oUCpOoFb" role="3oSUPX">
+                <ref role="cht4Q" to="py52:3GRi4m$qNsQ" resolve="GoalStructure" />
+              </node>
+              <node concept="2YIFZM" id="5pJnDA9ktAF" role="1m5AlR">
                 <ref role="1Pybhc" node="4eRbb89BzK0" resolve="SelectNodeUtil" />
                 <ref role="37wK5l" node="4eRbb89BRvz" resolve="resolveNode" />
                 <node concept="3_PKRz" id="5pJnDA9ktAG" role="37wK5m">
@@ -1651,9 +1662,6 @@
                   <ref role="3_PKRw" node="5pJnDA9ktAk" resolve="gsnNode" />
                 </node>
               </node>
-              <node concept="3Tqbb2" id="5pJnDA9ktAI" role="10QFUM">
-                <ref role="ehGHo" to="py52:3GRi4m$qNsQ" resolve="GoalStructure" />
-              </node>
             </node>
           </node>
         </node>
@@ -1910,8 +1918,12 @@
             <node concept="3Tqbb2" id="5pJnDA9lfRw" role="1tU5fm">
               <ref role="ehGHo" to="py52:3GRi4m$qNsQ" resolve="GoalStructure" />
             </node>
-            <node concept="10QFUN" id="5pJnDA9lfRx" role="33vP2m">
-              <node concept="2YIFZM" id="5pJnDA9lfRy" role="10QFUP">
+            <node concept="1PxgMI" id="1a4oUCpOdZz" role="33vP2m">
+              <property role="1BlNFB" value="true" />
+              <node concept="chp4Y" id="1a4oUCpOe5b" role="3oSUPX">
+                <ref role="cht4Q" to="py52:3GRi4m$qNsQ" resolve="GoalStructure" />
+              </node>
+              <node concept="2YIFZM" id="5pJnDA9lfRy" role="1m5AlR">
                 <ref role="37wK5l" node="4eRbb89BRvz" resolve="resolveNode" />
                 <ref role="1Pybhc" node="4eRbb89BzK0" resolve="SelectNodeUtil" />
                 <node concept="3_PKRz" id="5pJnDA9lfRz" role="37wK5m">
@@ -1921,9 +1933,6 @@
                   <ref role="3_PKRw" node="5pJnDA9lfRb" resolve="gsnNode" />
                 </node>
               </node>
-              <node concept="3Tqbb2" id="5pJnDA9lfR_" role="10QFUM">
-                <ref role="ehGHo" to="py52:3GRi4m$qNsQ" resolve="GoalStructure" />
-              </node>
             </node>
           </node>
         </node>
@@ -2076,8 +2085,12 @@
             <node concept="3Tqbb2" id="2SMJEPn9RE9" role="1tU5fm">
               <ref role="ehGHo" to="py52:3GRi4m$qNsQ" resolve="GoalStructure" />
             </node>
-            <node concept="10QFUN" id="2SMJEPn9REa" role="33vP2m">
-              <node concept="2YIFZM" id="2SMJEPn9REb" role="10QFUP">
+            <node concept="1PxgMI" id="1a4oUCpObiY" role="33vP2m">
+              <property role="1BlNFB" value="true" />
+              <node concept="chp4Y" id="1a4oUCpObuU" role="3oSUPX">
+                <ref role="cht4Q" to="py52:3GRi4m$qNsQ" resolve="GoalStructure" />
+              </node>
+              <node concept="2YIFZM" id="2SMJEPn9REb" role="1m5AlR">
                 <ref role="37wK5l" node="4eRbb89BRvz" resolve="resolveNode" />
                 <ref role="1Pybhc" node="4eRbb89BzK0" resolve="SelectNodeUtil" />
                 <node concept="3_PKRz" id="2SMJEPn9REc" role="37wK5m">
@@ -2087,9 +2100,6 @@
                   <ref role="3_PKRw" node="2SMJEPn9RDO" resolve="gsnNode" />
                 </node>
               </node>
-              <node concept="3Tqbb2" id="2SMJEPn9REe" role="10QFUM">
-                <ref role="ehGHo" to="py52:3GRi4m$qNsQ" resolve="GoalStructure" />
-              </node>
             </node>
           </node>
         </node>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.stamp.pluginSolution/com.mbeddr.formal.safety.stamp.pluginSolution.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.stamp.pluginSolution/com.mbeddr.formal.safety.stamp.pluginSolution.msd
index aee53e824..f09757c30 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.stamp.pluginSolution/com.mbeddr.formal.safety.stamp.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.stamp.pluginSolution/com.mbeddr.formal.safety.stamp.pluginSolution.msd
@@ -32,7 +32,6 @@
     <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="945808cb-09a0-4d70-9f2a-186b7f5c6219(com.mbeddr.formal.base.pluginSolution)" version="0" />
     <module reference="7e777b53-0a6b-4719-b36d-10475788d49f(com.mbeddr.formal.safety.stamp)" version="0" />
     <module reference="29225a93-74b7-4dc0-b3c5-36b7e42fa0f0(com.mbeddr.formal.safety.stamp.pluginSolution)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/test.com.mbeddr.formal.safety.argument.runtime/models/test.com.mbeddr.formal.safety.argument.runtime._010_smoke@tests.mps b/code/languages/com.mbeddr.formal.safety/solutions/test.com.mbeddr.formal.safety.argument.runtime/models/test.com.mbeddr.formal.safety.argument.runtime._010_smoke@tests.mps
index 6db5af13f..94b7ce0b9 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/test.com.mbeddr.formal.safety.argument.runtime/models/test.com.mbeddr.formal.safety.argument.runtime._010_smoke@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/test.com.mbeddr.formal.safety.argument.runtime/models/test.com.mbeddr.formal.safety.argument.runtime._010_smoke@tests.mps
@@ -4,11 +4,6 @@
   <languages>
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="8ca79d43-eb45-4791-bdd4-0d6130ff895b" name="de.itemis.mps.editor.diagram.layout" version="0" />
-    <use id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext" version="0" />
-    <use id="d3a0fd26-445a-466c-900e-10444ddfed52" name="com.mbeddr.mpsutil.filepicker" version="0" />
-    <use id="546ac349-3106-438d-b92b-7d2ebfa2ade8" name="com.mbeddr.formal.safety.argument.runtime" version="0" />
-    <use id="e8a04d94-4307-4f88-95a2-25f7c4f39437" name="com.mbeddr.formal.safety.gsn" version="3" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
   </languages>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/test.com.mbeddr.formal.safety.argument.runtime/test.com.mbeddr.formal.safety.argument.runtime.msd b/code/languages/com.mbeddr.formal.safety/solutions/test.com.mbeddr.formal.safety.argument.runtime/test.com.mbeddr.formal.safety.argument.runtime.msd
index a662829fd..2653b233c 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/test.com.mbeddr.formal.safety.argument.runtime/test.com.mbeddr.formal.safety.argument.runtime.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/test.com.mbeddr.formal.safety.argument.runtime/test.com.mbeddr.formal.safety.argument.runtime.msd
@@ -20,7 +20,6 @@
     <language slang="l:83ed2dfe-f724-46cc-852a-dce086daee3f:com.mbeddr.formal.base" version="0" />
     <language slang="l:546ac349-3106-438d-b92b-7d2ebfa2ade8:com.mbeddr.formal.safety.argument.runtime" version="0" />
     <language slang="l:e8a04d94-4307-4f88-95a2-25f7c4f39437:com.mbeddr.formal.safety.gsn" version="3" />
-    <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" />
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test.com.fasten.safety.doc2word.msd b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test.com.fasten.safety.doc2word.msd
index df63eb185..935f2a7d2 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test.com.fasten.safety.doc2word.msd
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test.com.fasten.safety.doc2word.msd
@@ -17,8 +17,6 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">2374bc90-7e37-41f1-a9c4-c2e35194c36a(com.mbeddr.doc)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
-    <dependency reexport="false">e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)</dependency>
-    <dependency reexport="false">71bb25aa-20fa-4c18-8954-1b176576f52d(com.mpsbasics.docx4j.lib)</dependency>
     <dependency reexport="false">b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">5f04c496-eb21-4501-981b-4e5fc2ab46ec(com.mpsbasics.docx4j.testutils)</dependency>
@@ -67,13 +65,11 @@
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="3" />
     <module reference="2374bc90-7e37-41f1-a9c4-c2e35194c36a(com.mbeddr.doc)" version="0" />
-    <module reference="e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)" version="0" />
     <module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
     <module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
     <module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
     <module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
     <module reference="fdd69818-de3d-4ebf-9ec6-17ea152db151(com.mpsbasics.docx4j.core)" version="0" />
-    <module reference="71bb25aa-20fa-4c18-8954-1b176576f52d(com.mpsbasics.docx4j.lib)" version="0" />
     <module reference="5f04c496-eb21-4501-981b-4e5fc2ab46ec(com.mpsbasics.docx4j.testutils)" 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" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft.xfta/test.com.fasten.safety.ft.xfta.msd b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft.xfta/test.com.fasten.safety.ft.xfta.msd
index fc1482d85..554d30c94 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft.xfta/test.com.fasten.safety.ft.xfta.msd
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft.xfta/test.com.fasten.safety.ft.xfta.msd
@@ -16,9 +16,7 @@
     <dependency reexport="false">ab274f70-5238-4883-adc7-02df7a757829(com.fasten.safety.ft)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-    <dependency reexport="false">4dc47fba-0f4f-4162-820b-d2e1e306482d(com.fasten.safety.ft.pluginSolution)</dependency>
     <dependency reexport="false">54912f5b-43b5-48a6-b710-8bbe3bcf9649(com.fasten.safety.ft.xfta.pluginSolution)</dependency>
-    <dependency reexport="false">990507d3-3527-4c54-bfe9-0ca3c9c6247a(com.dslfoundry.plaintextgen)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:ab274f70-5238-4883-adc7-02df7a757829:com.fasten.safety.ft" version="1" />
@@ -43,9 +41,7 @@
     <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="990507d3-3527-4c54-bfe9-0ca3c9c6247a(com.dslfoundry.plaintextgen)" version="0" />
     <module reference="ab274f70-5238-4883-adc7-02df7a757829(com.fasten.safety.ft)" version="0" />
-    <module reference="4dc47fba-0f4f-4162-820b-d2e1e306482d(com.fasten.safety.ft.pluginSolution)" version="0" />
     <module reference="54912f5b-43b5-48a6-b710-8bbe3bcf9649(com.fasten.safety.ft.xfta.pluginSolution)" version="0" />
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="8ca79d43-eb45-4791-bdd4-0d6130ff895b(de.itemis.mps.editor.diagram.layout)" version="0" />
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 ab4c5ae08..628a95df0 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
@@ -12,7 +12,6 @@
     <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)" />
     <import index="3f8v" ref="r:50ca0529-8a5f-4820-895a-98152d428af3(com.fasten.safety.ft.plugin)" />
     <import index="spwl" ref="r:ea5ecccc-669e-41c1-a43d-021bc4263d33(com.fasten.safety.ft.structure)" />
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.mbeddr.formal.safety.stamp/test.com.mbeddr.formal.safety.stamp.msd b/code/languages/com.mbeddr.formal.safety/tests/test.com.mbeddr.formal.safety.stamp/test.com.mbeddr.formal.safety.stamp.msd
index 1ff1a67df..8f316dabd 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.com.mbeddr.formal.safety.stamp/test.com.mbeddr.formal.safety.stamp.msd
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.com.mbeddr.formal.safety.stamp/test.com.mbeddr.formal.safety.stamp.msd
@@ -15,7 +15,6 @@
     <dependency reexport="false">7e777b53-0a6b-4719-b36d-10475788d49f(com.mbeddr.formal.safety.stamp)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:83ed2dfe-f724-46cc-852a-dce086daee3f:com.mbeddr.formal.base" version="0" />
     <language slang="l:7e777b53-0a6b-4719-b36d-10475788d49f:com.mbeddr.formal.safety.stamp" version="2" />
     <language slang="l:8ca79d43-eb45-4791-bdd4-0d6130ff895b:de.itemis.mps.editor.diagram.layout" version="0" />
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
@@ -34,7 +33,6 @@
     <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="7e777b53-0a6b-4719-b36d-10475788d49f(com.mbeddr.formal.safety.stamp)" 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" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._010_atomic_components@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._010_atomic_components@tests.mps
index ed4acf01d..4564fe1c7 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._010_atomic_components@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._010_atomic_components@tests.mps
@@ -6,11 +6,7 @@
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="c6d7e8a3-3d80-479a-8799-a11fe1902b1c" name="com.fasten.safety.hiphops" version="0" />
     <use id="521724dc-29ef-4d5a-9c15-25f6b680b809" name="com.fasten.safety.hiphops.arch" version="0" />
-    <use id="58bd9c99-ba42-4205-b3c9-ce445fd870e6" name="com.mbeddr.formal.nusmv.cbd" version="1" />
     <use id="8ca79d43-eb45-4791-bdd4-0d6130ff895b" name="de.itemis.mps.editor.diagram.layout" version="0" />
-    <use id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext" version="0" />
-    <use id="001b2375-3bd5-4d5e-9958-6b3f62dc8548" name="com.mbeddr.formal.nusmv" version="0" />
-    <use id="c0e6afd4-e20f-4e33-9970-004cf26b9bf6" name="com.mbeddr.formal.nusmv.ext" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="b43c548b-f75f-46e2-ad24-de9edd93e95e" name="com.fasten.safety.fmea" version="0" />
   </languages>
@@ -20,7 +16,6 @@
     <import index="o8e" ref="r:d7272d49-be4c-48bc-8ddb-711079cdb64b(test.fasten.safety.hiphops._010_arch_models)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="zsc5" ref="r:fc2953cc-af52-42fa-8e2a-cc41987cb142(com.fasten.safety.hiphops.arch.structure)" />
-    <import index="7wpd" ref="c7a315e6-1d93-4186-85bc-2dfafd1ccc21/r:fb1c47d7-a72e-4e01-92dc-1e9f2ba4a118(com.mbeddr.mpsutil.common/com.mbeddr.mpsutil.common.util)" />
     <import index="mqum" ref="r:ec874b45-e888-42e6-995a-a298cefdff55(com.mbeddr.mpsutil.comparator.code)" />
     <import index="n7z1" ref="r:d9248eb8-cb38-4cb3-8454-cc903ebf6c86(com.fasten.safety.ft.typesystem)" />
     <import index="fazf" ref="r:28cb0bbd-efcb-4c9e-94f2-4ccc928adfb4(com.fasten.safety.ft.behavior)" implicit="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._020_composite_components@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._020_composite_components@tests.mps
index 89c0ffef8..87a9073b3 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._020_composite_components@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._020_composite_components@tests.mps
@@ -5,20 +5,12 @@
   <languages>
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="c6d7e8a3-3d80-479a-8799-a11fe1902b1c" name="com.fasten.safety.hiphops" version="0" />
-    <use id="521724dc-29ef-4d5a-9c15-25f6b680b809" name="com.fasten.safety.hiphops.arch" version="0" />
-    <use id="58bd9c99-ba42-4205-b3c9-ce445fd870e6" name="com.mbeddr.formal.nusmv.cbd" version="1" />
     <use id="8ca79d43-eb45-4791-bdd4-0d6130ff895b" name="de.itemis.mps.editor.diagram.layout" version="0" />
-    <use id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext" version="0" />
-    <use id="001b2375-3bd5-4d5e-9958-6b3f62dc8548" name="com.mbeddr.formal.nusmv" version="0" />
-    <use id="c0e6afd4-e20f-4e33-9970-004cf26b9bf6" name="com.mbeddr.formal.nusmv.ext" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
   </languages>
   <imports>
     <import index="spwl" ref="r:ea5ecccc-669e-41c1-a43d-021bc4263d33(com.fasten.safety.ft.structure)" />
-    <import index="o8e" ref="r:d7272d49-be4c-48bc-8ddb-711079cdb64b(test.fasten.safety.hiphops._010_arch_models)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
-    <import index="zsc5" ref="r:fc2953cc-af52-42fa-8e2a-cc41987cb142(com.fasten.safety.hiphops.arch.structure)" />
     <import index="mqum" ref="r:ec874b45-e888-42e6-995a-a298cefdff55(com.mbeddr.mpsutil.comparator.code)" />
     <import index="wid" ref="r:f00673e3-aa4b-47ab-b1ab-32f93476e624(com.fasten.safety.hiphops.arch.util)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/test.fasten.safety.hiphops.msd b/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/test.fasten.safety.hiphops.msd
index 3a148fe63..671d86465 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/test.fasten.safety.hiphops.msd
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/test.fasten.safety.hiphops.msd
@@ -14,7 +14,6 @@
   <dependencies>
     <dependency reexport="false">c6d7e8a3-3d80-479a-8799-a11fe1902b1c(com.fasten.safety.hiphops)</dependency>
     <dependency reexport="false">ab274f70-5238-4883-adc7-02df7a757829(com.fasten.safety.ft)</dependency>
-    <dependency reexport="false">c7a315e6-1d93-4186-85bc-2dfafd1ccc21(com.mbeddr.mpsutil.common)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="false">521724dc-29ef-4d5a-9c15-25f6b680b809(com.fasten.safety.hiphops.arch)</dependency>
@@ -67,7 +66,6 @@
     <module reference="001b2375-3bd5-4d5e-9958-6b3f62dc8548(com.mbeddr.formal.nusmv)" version="0" />
     <module reference="58bd9c99-ba42-4205-b3c9-ce445fd870e6(com.mbeddr.formal.nusmv.cbd)" version="1" />
     <module reference="bf72618c-958a-47f5-9aac-3eff98d79ffd(com.mbeddr.formal.nusmv.source)" version="0" />
-    <module reference="c7a315e6-1d93-4186-85bc-2dfafd1ccc21(com.mbeddr.mpsutil.common)" version="0" />
     <module reference="c6420b75-4569-420d-aaf7-9bc590ad7b2a(com.mbeddr.mpsutil.comparator)" version="0" />
     <module reference="8ca79d43-eb45-4791-bdd4-0d6130ff895b(de.itemis.mps.editor.diagram.layout)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/models/test.mbeddr.formal.gsn.patterns._020_hazards_pattern@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/models/test.mbeddr.formal.gsn.patterns._020_hazards_pattern@tests.mps
index 31f789792..7e6775621 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/models/test.mbeddr.formal.gsn.patterns._020_hazards_pattern@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/models/test.mbeddr.formal.gsn.patterns._020_hazards_pattern@tests.mps
@@ -6,10 +6,8 @@
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="f465db4c-63d4-40ef-afda-acd713dc19a1" name="com.mbeddr.formal.safety.gsn.patterns" version="0" />
     <use id="e8a04d94-4307-4f88-95a2-25f7c4f39437" name="com.mbeddr.formal.safety.gsn" version="3" />
-    <use id="0deccdfd-196b-4d8c-895e-0d6cb8014dfd" name="com.mbeddr.formal.req.base" version="0" />
     <use id="8ca79d43-eb45-4791-bdd4-0d6130ff895b" name="de.itemis.mps.editor.diagram.layout" version="0" />
     <use id="17da266c-02d9-4bbd-b69b-8a656b49f45c" name="com.mbeddr.formal.safety.hara" version="0" />
-    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
   </languages>
   <imports>
     <import index="f412" ref="r:286451e8-fda5-4f23-9d36-933ba02757d6(com.mbeddr.formal.safety.gsn.patterns.typesystem)" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/models/test.mbeddr.formal.gsn.patterns._100_goal_structure_layout@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/models/test.mbeddr.formal.gsn.patterns._100_goal_structure_layout@tests.mps
index 0379b1668..2772ea886 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/models/test.mbeddr.formal.gsn.patterns._100_goal_structure_layout@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/models/test.mbeddr.formal.gsn.patterns._100_goal_structure_layout@tests.mps
@@ -10,7 +10,6 @@
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
   </languages>
   <imports>
-    <import index="f412" ref="r:286451e8-fda5-4f23-9d36-933ba02757d6(com.mbeddr.formal.safety.gsn.patterns.typesystem)" />
     <import index="zgib" ref="r:903ee02f-828a-46a1-95b8-23d503790e08(com.mbeddr.formal.safety.gsn.ext.intentions)" />
     <import index="95j3" ref="r:b59c48c6-3515-4a72-8146-4b8c723b8307(com.mbeddr.formal.base.diagram_utils)" />
     <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/test.mbeddr.formal.gsn.patterns.msd b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/test.mbeddr.formal.gsn.patterns.msd
index ddfe9a7c5..7caf98ae1 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/test.mbeddr.formal.gsn.patterns.msd
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/test.mbeddr.formal.gsn.patterns.msd
@@ -50,7 +50,6 @@
     <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:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._000_gsn_generic_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._000_gsn_generic_tests@tests.mps
index 1fe51c4be..1b6daa946 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._000_gsn_generic_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._000_gsn_generic_tests@tests.mps
@@ -6,16 +6,9 @@
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="e8a04d94-4307-4f88-95a2-25f7c4f39437" name="com.mbeddr.formal.safety.gsn" version="3" />
-    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
   </languages>
   <imports>
-    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
-    <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
-    <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
-    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="s9pq" ref="r:8ef909e6-5cd8-45b2-9793-5a70f4829a0a(com.mbeddr.formal.safety.gsn.external_evidence.structure)" />
-    <import index="kq9k" ref="r:26cf53ce-de1d-47e1-8acc-79dd464f660a(com.mbeddr.formal.safety.gsn.external_evidence.util)" />
     <import index="87nw" ref="r:ca2ab6bb-f6e7-4c0f-a88c-b78b9b31fff3(de.slisson.mps.richtext.structure)" implicit="true" />
     <import index="89jy" ref="r:b084f3b4-d6a1-4460-8222-b4a956bb5d23(com.mbeddr.formal.safety.gsn.behavior)" implicit="true" />
   </imports>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._020_gsn_cbd_smv_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._020_gsn_cbd_smv_tests@tests.mps
index 7ec9364f0..f25b52295 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._020_gsn_cbd_smv_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._020_gsn_cbd_smv_tests@tests.mps
@@ -6,22 +6,16 @@
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
-    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
   </languages>
   <imports>
     <import index="4c75" ref="r:088add12-8a36-47c2-b0d2-7180a8a2a891(com.mbeddr.formal.nusmv.pluginSolution.runner)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
-    <import index="bsp8" ref="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" />
     <import index="2ocj" ref="r:0af55dc0-14f5-45c8-bf12-3c673ca075ac(com.mbeddr.formal.base.tooling.analyzer)" />
     <import index="xygl" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.progress(MPS.IDEA/)" />
-    <import index="xy37" ref="r:186b413f-9752-4da9-a476-351651745753(com.mbeddr.formal.safety.gsn.smv.pluginSolution.analyzers)" />
-    <import index="gioj" ref="r:a6dee7e9-c79f-4293-b631-7c366a8877df(com.mbeddr.formal.nusmv.structure)" />
     <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
-    <import index="fnq2" ref="r:412c918d-151c-45fe-acf3-0268d0d563c1(com.mbeddr.formal.nusmv.tests.structure)" />
     <import index="50mr" ref="r:af038500-12da-40fb-9885-21380faabbb0(com.mbeddr.formal.safety.gsn.cbd.pluginSolution.analyzers)" />
     <import index="g8ih" ref="r:d04ada13-9d56-43be-9fbe-16c353913377(com.mbeddr.formal.safety.gsn.patterns.behavior)" />
-    <import index="vzqj" ref="r:27bd828c-1d2d-479d-bb43-b193c82b9c29(com.mbeddr.formal.nusmv.cbd.structure)" />
     <import index="3whv" ref="r:b1da8ad9-7b88-4c56-bf74-d8352a2282f9(com.mbeddr.formal.base.arch.structure)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
     <import index="2qxf" ref="r:92bf1daa-4510-4ff1-a9b1-c695f68c3f1d(com.mbeddr.formal.safety.gsn.patterns.structure)" implicit="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._020_gsn_cbd_ts_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._020_gsn_cbd_ts_tests@tests.mps
index abaf846e3..80d68d914 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._020_gsn_cbd_ts_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._020_gsn_cbd_ts_tests@tests.mps
@@ -5,9 +5,6 @@
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="f465db4c-63d4-40ef-afda-acd713dc19a1" name="com.mbeddr.formal.safety.gsn.patterns" version="0" />
-    <use id="71797868-de95-425c-8470-36aa52c8ebc4" name="com.mbeddr.formal.base.arch" version="1" />
-    <use id="7f3eac5a-7f9a-4fbe-8264-f69c70ece985" name="com.mbeddr.formal.safety.gsn.smv" version="9" />
-    <use id="58bd9c99-ba42-4205-b3c9-ce445fd870e6" name="com.mbeddr.formal.nusmv.cbd" version="1" />
     <devkit ref="edb51d2d-64eb-404a-818e-c1cabf1d58d5(fasten.nusmv)" />
     <devkit ref="b64463ba-ae31-4cf7-be7b-afc13cab4daa(fasten.safety.gsn)" />
   </languages>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._050_gsn_odd_spin_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._050_gsn_odd_spin_tests@tests.mps
index 3ee8221ad..c143a5dac 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._050_gsn_odd_spin_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._050_gsn_odd_spin_tests@tests.mps
@@ -7,22 +7,14 @@
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
-    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
   </languages>
   <imports>
-    <import index="4c75" ref="r:088add12-8a36-47c2-b0d2-7180a8a2a891(com.mbeddr.formal.nusmv.pluginSolution.runner)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
-    <import index="bsp8" ref="r:75e88ff0-50a7-4e0f-918f-50f3340a9e00(com.mbeddr.formal.safety.gsn.smv.structure)" />
     <import index="2ocj" ref="r:0af55dc0-14f5-45c8-bf12-3c673ca075ac(com.mbeddr.formal.base.tooling.analyzer)" />
     <import index="xygl" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.progress(MPS.IDEA/)" />
-    <import index="xy37" ref="r:186b413f-9752-4da9-a476-351651745753(com.mbeddr.formal.safety.gsn.smv.pluginSolution.analyzers)" />
-    <import index="gioj" ref="r:a6dee7e9-c79f-4293-b631-7c366a8877df(com.mbeddr.formal.nusmv.structure)" />
     <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
-    <import index="fnq2" ref="r:412c918d-151c-45fe-acf3-0268d0d563c1(com.mbeddr.formal.nusmv.tests.structure)" />
     <import index="9yqz" ref="r:d1eb74f9-9d34-407a-a9ad-563871bceb90(com.mbeddr.formal.spin.analyses.structure)" />
-    <import index="5do7" ref="r:42e0f0fc-96f0-4fca-9aeb-f9625e145b23(com.mbeddr.formal.spin.analyzer)" />
-    <import index="5o3t" ref="r:886c1fde-9e42-4d36-9997-5ffa6d5b0b5b(com.mbeddr.formal.safety.gsn.spin.pluginSolution.plugin)" />
     <import index="z4ol" ref="r:a03a882e-be67-46a6-adb2-41cedc56b233(com.mbeddr.formal.safety.gsn.odd.structure)" />
     <import index="vt3w" ref="r:adc36c3c-4daf-4fb6-87db-41b3b762af25(com.mbeddr.formal.spin.analyses.behavior)" />
     <import index="imq8" ref="r:828869ae-99a6-40b2-b521-4aef1ed3af63(com.mbeddr.formal.spin.analyzer.model)" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._100_gsn_confidence_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._100_gsn_confidence_tests@tests.mps
index ac26f6713..327bb6508 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._100_gsn_confidence_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._100_gsn_confidence_tests@tests.mps
@@ -11,7 +11,6 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
   </languages>
   <imports>
     <import index="amuf" ref="r:b775b7e1-c824-441c-afe0-ed9eafc83544(com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.plugin)" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._110_gsn_import_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._110_gsn_import_tests@tests.mps
index 888b0920b..39bf0194f 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._110_gsn_import_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._110_gsn_import_tests@tests.mps
@@ -4,24 +4,14 @@
   <languages>
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="e8a04d94-4307-4f88-95a2-25f7c4f39437" name="com.mbeddr.formal.safety.gsn" version="3" />
-    <use id="d2864642-8e1f-4dd8-b3a6-71f0d9d33ae8" name="com.mbeddr.formal.safety.gsn.confidence.dempster_shafer" version="0" />
-    <use id="8ca79d43-eb45-4791-bdd4-0d6130ff895b" name="de.itemis.mps.editor.diagram.layout" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
-    <use id="ad93155d-79b2-4759-b10c-55123e763903" name="jetbrains.mps.lang.messages" version="0" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
   </languages>
   <imports>
-    <import index="amuf" ref="r:b775b7e1-c824-441c-afe0-ed9eafc83544(com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.plugin)" />
-    <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
     <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
-    <import index="ete6" ref="r:c6bdd195-1038-4b99-a42c-224032348902(com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.typesystem)" />
     <import index="mn49" ref="r:ebac6728-c6a8-4013-bfe5-28454fe70ff7(com.mbeddr.formal.safety.gsn.importer.util)" />
     <import index="tbr6" ref="r:6a005c26-87c0-43c4-8cf3-49ffba1099df(de.slisson.mps.richtext.behavior)" implicit="true" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" implicit="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/test.mbeddr.formal.gsn.msd b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/test.mbeddr.formal.gsn.msd
index 1fdd07399..960930e32 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/test.mbeddr.formal.gsn.msd
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/test.mbeddr.formal.gsn.msd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <solution name="test.mbeddr.formal.gsn" uuid="6988fbc3-c4bb-4258-b65b-4ff9985f8674" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
@@ -20,11 +20,9 @@
     <dependency reexport="false">cac6875e-14fd-4552-a69e-b3168e27e2ff(com.mbeddr.formal.nusmv.tests)</dependency>
     <dependency reexport="false">80ea7e60-3c36-4583-be96-3e7d3ad3504e(com.mbeddr.formal.spin.analyses)</dependency>
     <dependency reexport="false">9ce94094-51d9-4013-bdfc-e4db03298f9f(com.mbeddr.formal.spin.pluginSolution)</dependency>
-    <dependency reexport="false">6341c6a5-9840-4a80-b3ed-d5236d1e80de(com.mbeddr.formal.safety.gsn.spin.pluginSolution)</dependency>
     <dependency reexport="false">8c301636-fbda-4009-bce8-7e00c3c1bac5(com.mbeddr.formal.safety.gsn.odd)</dependency>
     <dependency reexport="false">6eae6fbd-9940-4c94-855c-110c062b01e3(com.mbeddr.formal.safety.gsn.cbd.pluginSolution)</dependency>
     <dependency reexport="false">f465db4c-63d4-40ef-afda-acd713dc19a1(com.mbeddr.formal.safety.gsn.patterns)</dependency>
-    <dependency reexport="false">58bd9c99-ba42-4205-b3c9-ce445fd870e6(com.mbeddr.formal.nusmv.cbd)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
@@ -32,6 +30,7 @@
     <dependency reexport="false">5e7ffa70-8e23-49f4-8c13-a887bba14c36(com.mbeddr.formal.safety.gsn.external_evidence)</dependency>
     <dependency reexport="false">d2864642-8e1f-4dd8-b3a6-71f0d9d33ae8(com.mbeddr.formal.safety.gsn.confidence.dempster_shafer)</dependency>
     <dependency reexport="false">a7775cc7-19db-41cf-a724-3212ac4437b9(com.mbeddr.formal.safety.gsn.importer)</dependency>
+    <dependency reexport="false">71797868-de95-425c-8470-36aa52c8ebc4(com.mbeddr.formal.base.arch)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:3b22dedc-d6cf-4626-9445-6e9909b3e04a:com.fasten.base.arch.msc" version="0" />
@@ -75,11 +74,9 @@
     <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="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:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
     <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" />
@@ -99,9 +96,7 @@
     <module reference="b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)" version="0" />
     <module reference="e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)" version="0" />
     <module reference="001b2375-3bd5-4d5e-9958-6b3f62dc8548(com.mbeddr.formal.nusmv)" version="0" />
-    <module reference="58bd9c99-ba42-4205-b3c9-ce445fd870e6(com.mbeddr.formal.nusmv.cbd)" version="1" />
     <module reference="692c2a6d-09c5-40f7-98f0-1f4b59860c1b(com.mbeddr.formal.nusmv.pluginSolution)" version="0" />
-    <module reference="bf72618c-958a-47f5-9aac-3eff98d79ffd(com.mbeddr.formal.nusmv.source)" version="0" />
     <module reference="cac6875e-14fd-4552-a69e-b3168e27e2ff(com.mbeddr.formal.nusmv.tests)" version="0" />
     <module reference="e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)" version="0" />
     <module reference="6eae6fbd-9940-4c94-855c-110c062b01e3(com.mbeddr.formal.safety.gsn.cbd.pluginSolution)" version="0" />
@@ -112,7 +107,6 @@
     <module reference="f465db4c-63d4-40ef-afda-acd713dc19a1(com.mbeddr.formal.safety.gsn.patterns)" version="0" />
     <module reference="7f3eac5a-7f9a-4fbe-8264-f69c70ece985(com.mbeddr.formal.safety.gsn.smv)" version="8" />
     <module reference="7deddb2c-6152-400d-b886-3520afdc89b1(com.mbeddr.formal.safety.gsn.smv.pluginSolution)" version="0" />
-    <module reference="6341c6a5-9840-4a80-b3ed-d5236d1e80de(com.mbeddr.formal.safety.gsn.spin.pluginSolution)" version="0" />
     <module reference="ad8d48af-022b-40dc-8979-2b76074fb438(com.mbeddr.formal.spin)" version="0" />
     <module reference="80ea7e60-3c36-4583-be96-3e7d3ad3504e(com.mbeddr.formal.spin.analyses)" version="0" />
     <module reference="9ce94094-51d9-4013-bdfc-e4db03298f9f(com.mbeddr.formal.spin.pluginSolution)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.safety.argument.modelquery/models/test.mbeddr.formal.safety.argument.modelquery._010_smoke_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.safety.argument.modelquery/models/test.mbeddr.formal.safety.argument.modelquery._010_smoke_tests@tests.mps
index 601137a8b..b1f2153e8 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.safety.argument.modelquery/models/test.mbeddr.formal.safety.argument.modelquery._010_smoke_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.safety.argument.modelquery/models/test.mbeddr.formal.safety.argument.modelquery._010_smoke_tests@tests.mps
@@ -5,20 +5,9 @@
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="8ca79d43-eb45-4791-bdd4-0d6130ff895b" name="de.itemis.mps.editor.diagram.layout" version="0" />
-    <use id="434b2bfb-bd7a-47c9-bced-b445035e6d96" name="com.mbeddr.formal.safety.req" version="1" />
-    <use id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext" version="0" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
-    <use id="0deccdfd-196b-4d8c-895e-0d6cb8014dfd" name="com.mbeddr.formal.req.base" version="0" />
-    <use id="17da266c-02d9-4bbd-b69b-8a656b49f45c" name="com.mbeddr.formal.safety.hara" version="0" />
-    <use id="e8a04d94-4307-4f88-95a2-25f7c4f39437" name="com.mbeddr.formal.safety.gsn" version="3" />
-    <use id="57ecebe4-dfb8-4fef-9175-0008e04a3684" name="com.mbeddr.formal.safety.argument.modelquery" version="0" />
   </languages>
   <imports>
-    <import index="89jy" ref="r:b084f3b4-d6a1-4460-8222-b4a956bb5d23(com.mbeddr.formal.safety.gsn.behavior)" />
-    <import index="cjwq" ref="r:7e1f4da1-19b3-4ceb-bcab-0237eb7a50b7(com.mbeddr.formal.safety.hara.structure)" />
-    <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
-    <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="9br2" ref="r:70aadfb3-8246-45ac-bcd1-b345c7f7cfe4(com.mbeddr.formal.safety.argument.modelquery.structure)" />
     <import index="oq0u" ref="r:e0fdabfa-18f0-4762-8817-0e7b1735bd5d(com.mbeddr.formal.safety.argument.modelquery.util)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/com.mbeddr.formal.safety.tutorial.msd b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/com.mbeddr.formal.safety.tutorial.msd
index 65b3cfc80..ae071af91 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/com.mbeddr.formal.safety.tutorial.msd
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/com.mbeddr.formal.safety.tutorial.msd
@@ -102,7 +102,6 @@
     <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="2" />
-    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:1839bec5-cea6-41df-b9e0-c405ff35c41e:jetbrains.mps.lang.editor.imageGen" version="0" />
@@ -121,8 +120,6 @@
     <module reference="e1b41d7d-269e-4a91-a7d8-91bd657028d7(com.fasten.safety.doc2word)" version="0" />
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="e6e482a5-282a-4c6d-862a-311affd0586b(com.mbeddr.formal.safety.argument.jira_integration)" version="0" />
-    <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
-    <module reference="e6e482a5-282a-4c6d-862a-311affd0586b(com.mbeddr.formal.safety.argument.jira_integration)" version="0" />
     <module reference="04d81d12-7048-4552-9a53-86a271c0f094(com.mbeddr.formal.safety.argument.visualisation)" version="0" />
     <module reference="e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)" version="0" />
     <module reference="676b5323-9c6d-4b8d-a4fc-5d159c3d8aed(com.mbeddr.formal.safety.gsn.patterns.lib)" version="0" />
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_000_car_safety_features_ontology.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_000_car_safety_features_ontology.mpsr
index f866827b2..ed828be44 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_000_car_safety_features_ontology.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_000_car_safety_features_ontology.mpsr
@@ -21,7 +21,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_010_airbag_architecture.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_010_airbag_architecture.mpsr
index 225eaceb5..41d46d36d 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_010_airbag_architecture.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_010_airbag_architecture.mpsr
@@ -19,7 +19,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_010_simple_text_requirements.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_010_simple_text_requirements.mpsr
index f8ba9ed9f..7457cead1 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_010_simple_text_requirements.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_010_simple_text_requirements.mpsr
@@ -46,7 +46,7 @@
       <concept id="6156524541423588207" name="com.mbeddr.mpsutil.filepicker.structure.SolutionRelativeFilePicker" flags="ng" index="3NXOOs" />
     </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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_020_airbag_module_no_implementation.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_020_airbag_module_no_implementation.mpsr
index 765c2660e..ede605cab 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_020_airbag_module_no_implementation.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_020_airbag_module_no_implementation.mpsr
@@ -41,7 +41,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_020_text_tl_boilerplates_specs.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_020_text_tl_boilerplates_specs.mpsr
index f94835374..2031ad135 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_020_text_tl_boilerplates_specs.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_020_text_tl_boilerplates_specs.mpsr
@@ -4,10 +4,10 @@
   <imports />
   <registry>
     <language id="5ff577d1-1817-495b-9d6c-ff7b52c68609" name="com.mbeddr.formal.req.tl_patterns">
-      <concept id="7632099376746146979" name="com.mbeddr.formal.req.tl_patterns.structure.ISpecWithTime" flags="ng" index="Sxolh">
+      <concept id="7632099376746146979" name="com.mbeddr.formal.req.tl_patterns.structure.ISpecWithTime" flags="ngI" index="Sxolh">
         <child id="7632099376746146980" name="time" index="Sxolm" />
       </concept>
-      <concept id="7632099376746632815" name="com.mbeddr.formal.req.tl_patterns.structure.ISpecWithProbability" flags="ng" index="SB3Yt">
+      <concept id="7632099376746632815" name="com.mbeddr.formal.req.tl_patterns.structure.ISpecWithProbability" flags="ngI" index="SB3Yt">
         <child id="7632099376746632816" name="probability" index="SB3Y2" />
       </concept>
       <concept id="7632099376746544950" name="com.mbeddr.formal.req.tl_patterns.structure.HighProbabilityBound" flags="ng" index="SBTr4" />
@@ -45,7 +45,7 @@
       <concept id="2184270308345955043" name="com.mbeddr.formal.req.tl_patterns.structure.Time" flags="ng" index="3gddiA">
         <child id="2184270308345955380" name="unit" index="3gdd9L" />
       </concept>
-      <concept id="6544290145033523833" name="com.mbeddr.formal.req.tl_patterns.structure.ITLPropertyContainer" flags="ng" index="3z0uXf">
+      <concept id="6544290145033523833" name="com.mbeddr.formal.req.tl_patterns.structure.ITLPropertyContainer" flags="ngI" index="3z0uXf">
         <child id="6544290145033523834" name="specs" index="3z0uXc" />
       </concept>
       <concept id="6544290145033328590" name="com.mbeddr.formal.req.tl_patterns.structure.TextualExpression" flags="ng" index="3z7eFS">
@@ -88,7 +88,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_025_text_tl_boilerplates_specs_explicit_vocabulary.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_025_text_tl_boilerplates_specs_explicit_vocabulary.mpsr
index ee7bcb232..c778db55c 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_025_text_tl_boilerplates_specs_explicit_vocabulary.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_025_text_tl_boilerplates_specs_explicit_vocabulary.mpsr
@@ -4,10 +4,10 @@
   <imports />
   <registry>
     <language id="5ff577d1-1817-495b-9d6c-ff7b52c68609" name="com.mbeddr.formal.req.tl_patterns">
-      <concept id="7632099376746146979" name="com.mbeddr.formal.req.tl_patterns.structure.ISpecWithTime" flags="ng" index="Sxolh">
+      <concept id="7632099376746146979" name="com.mbeddr.formal.req.tl_patterns.structure.ISpecWithTime" flags="ngI" index="Sxolh">
         <child id="7632099376746146980" name="time" index="Sxolm" />
       </concept>
-      <concept id="7632099376746632815" name="com.mbeddr.formal.req.tl_patterns.structure.ISpecWithProbability" flags="ng" index="SB3Yt">
+      <concept id="7632099376746632815" name="com.mbeddr.formal.req.tl_patterns.structure.ISpecWithProbability" flags="ngI" index="SB3Yt">
         <child id="7632099376746632816" name="probability" index="SB3Y2" />
       </concept>
       <concept id="7632099376746544950" name="com.mbeddr.formal.req.tl_patterns.structure.HighProbabilityBound" flags="ng" index="SBTr4" />
@@ -45,7 +45,7 @@
       <concept id="2184270308345955043" name="com.mbeddr.formal.req.tl_patterns.structure.Time" flags="ng" index="3gddiA">
         <child id="2184270308345955380" name="unit" index="3gdd9L" />
       </concept>
-      <concept id="6544290145033523833" name="com.mbeddr.formal.req.tl_patterns.structure.ITLPropertyContainer" flags="ng" index="3z0uXf">
+      <concept id="6544290145033523833" name="com.mbeddr.formal.req.tl_patterns.structure.ITLPropertyContainer" flags="ngI" index="3z0uXf">
         <child id="6544290145033523834" name="specs" index="3z0uXc" />
       </concept>
       <concept id="6544290145033328590" name="com.mbeddr.formal.req.tl_patterns.structure.TextualExpression" flags="ng" index="3z7eFS">
@@ -96,7 +96,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_030_airbag_module_implementation.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_030_airbag_module_implementation.mpsr
index aa0cd74a7..802ef6652 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_030_airbag_module_implementation.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_030_airbag_module_implementation.mpsr
@@ -77,7 +77,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_030_formal_architecture_driven_req_spec.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_030_formal_architecture_driven_req_spec.mpsr
index b62df385a..eda95e2e5 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_030_formal_architecture_driven_req_spec.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_030_formal_architecture_driven_req_spec.mpsr
@@ -18,7 +18,7 @@
       <concept id="7240923401194766860" name="com.mbeddr.formal.req.tl_patterns.structure.ExistencePattern" flags="ng" index="12uYXO">
         <child id="7240923401194766873" name="p" index="12uYXx" />
       </concept>
-      <concept id="6544290145033523833" name="com.mbeddr.formal.req.tl_patterns.structure.ITLPropertyContainer" flags="ng" index="3z0uXf">
+      <concept id="6544290145033523833" name="com.mbeddr.formal.req.tl_patterns.structure.ITLPropertyContainer" flags="ngI" index="3z0uXf">
         <child id="6544290145033523834" name="specs" index="3z0uXc" />
       </concept>
     </language>
@@ -64,7 +64,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_040_airbag_module_sm_implementation.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_040_airbag_module_sm_implementation.mpsr
index 7a5d41e92..0429fc26b 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_040_airbag_module_sm_implementation.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_040_airbag_module_sm_implementation.mpsr
@@ -143,7 +143,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -180,7 +180,7 @@
       </concept>
     </language>
     <language id="71797868-de95-425c-8470-36aa52c8ebc4" name="com.mbeddr.formal.base.arch">
-      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ng" index="3Ic8zf">
+      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ngI" index="3Ic8zf">
         <child id="9066112305507315710" name="contracts" index="3UnIb_" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_040_formal_checkable_tl_spec_patterns_over_SMV.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_040_formal_checkable_tl_spec_patterns_over_SMV.mpsr
index a5280c5c9..97d880317 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_040_formal_checkable_tl_spec_patterns_over_SMV.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_040_formal_checkable_tl_spec_patterns_over_SMV.mpsr
@@ -18,7 +18,7 @@
       <concept id="7240923401194766860" name="com.mbeddr.formal.req.tl_patterns.structure.ExistencePattern" flags="ng" index="12uYXO">
         <child id="7240923401194766873" name="p" index="12uYXx" />
       </concept>
-      <concept id="6544290145033523833" name="com.mbeddr.formal.req.tl_patterns.structure.ITLPropertyContainer" flags="ng" index="3z0uXf">
+      <concept id="6544290145033523833" name="com.mbeddr.formal.req.tl_patterns.structure.ITLPropertyContainer" flags="ngI" index="3z0uXf">
         <child id="6544290145033523834" name="specs" index="3z0uXc" />
       </concept>
     </language>
@@ -59,7 +59,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_050_formal_SMV_module.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_050_formal_SMV_module.mpsr
index b5c3dd0c5..844d0efc7 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_050_formal_SMV_module.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_050_formal_SMV_module.mpsr
@@ -37,7 +37,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_070_spec_SM.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_070_spec_SM.mpsr
index 08de1220c..257756e3c 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_070_spec_SM.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements/_070_spec_SM.mpsr
@@ -35,7 +35,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._020_hazards_and_risk_analysis/_005_context_definition.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._020_hazards_and_risk_analysis/_005_context_definition.mpsr
index 0213680cb..9803e7093 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._020_hazards_and_risk_analysis/_005_context_definition.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._020_hazards_and_risk_analysis/_005_context_definition.mpsr
@@ -20,7 +20,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._020_hazards_and_risk_analysis/_020_airbag_unsafe_control_analysis.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._020_hazards_and_risk_analysis/_020_airbag_unsafe_control_analysis.mpsr
index 13c7a36b1..cff383c07 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._020_hazards_and_risk_analysis/_020_airbag_unsafe_control_analysis.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._020_hazards_and_risk_analysis/_020_airbag_unsafe_control_analysis.mpsr
@@ -45,7 +45,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._020_hazards_and_risk_analysis/_100_losses.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._020_hazards_and_risk_analysis/_100_losses.mpsr
index 5d5d79062..46961392c 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._020_hazards_and_risk_analysis/_100_losses.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._020_hazards_and_risk_analysis/_100_losses.mpsr
@@ -12,7 +12,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._020_hazards_and_risk_analysis/_110_airbag_hazards.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._020_hazards_and_risk_analysis/_110_airbag_hazards.mpsr
index 83a00bdff..456970b7b 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._020_hazards_and_risk_analysis/_110_airbag_hazards.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._020_hazards_and_risk_analysis/_110_airbag_hazards.mpsr
@@ -4,10 +4,10 @@
   <imports />
   <registry>
     <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">
+      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ngI" 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">
+      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ngI" 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">
@@ -19,7 +19,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._020_hazards_and_risk_analysis/_110_operational_situations.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._020_hazards_and_risk_analysis/_110_operational_situations.mpsr
index 8a5d4478f..f8f8dff9c 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._020_hazards_and_risk_analysis/_110_operational_situations.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._020_hazards_and_risk_analysis/_110_operational_situations.mpsr
@@ -12,7 +12,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_010_architecture.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_010_architecture.mpsr
index ccffcf9b4..f50012521 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_010_architecture.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_010_architecture.mpsr
@@ -35,7 +35,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_020_failure_modes_of_components.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_020_failure_modes_of_components.mpsr
index 134c2bfff..a3760fd23 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_020_failure_modes_of_components.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_020_failure_modes_of_components.mpsr
@@ -31,7 +31,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_030_failure_effects_on_system.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_030_failure_effects_on_system.mpsr
index 266160279..2a8b13de6 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_030_failure_effects_on_system.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_030_failure_effects_on_system.mpsr
@@ -29,7 +29,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_040_dfmea.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_040_dfmea.mpsr
index 0e6a6e882..46a0ea25e 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_040_dfmea.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_040_dfmea.mpsr
@@ -33,7 +33,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_100_fault_tree.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_100_fault_tree.mpsr
index e34f40860..a509ddf3e 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_100_fault_tree.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_100_fault_tree.mpsr
@@ -33,7 +33,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_200_arch.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_200_arch.mpsr
index 5dc40079a..3c809b78a 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_200_arch.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_200_arch.mpsr
@@ -27,7 +27,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_210_failure_modes.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_210_failure_modes.mpsr
index 2e30cf8f6..ae953eabc 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_210_failure_modes.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_210_failure_modes.mpsr
@@ -46,7 +46,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_220_IFMEAs.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_220_IFMEAs.mpsr
index 238a87bf5..c20c35c51 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_220_IFMEAs.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/_220_IFMEAs.mpsr
@@ -62,7 +62,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/generated normalized FT for 'System'.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/generated normalized FT for 'System'.mpsr
index ea6e0adc3..dd33cd594 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/generated normalized FT for 'System'.mpsr	
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models/generated normalized FT for 'System'.mpsr	
@@ -21,7 +21,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_000_confidence_for_ACP_01.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_000_confidence_for_ACP_01.mpsr
index 5e0881783..77f841239 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_000_confidence_for_ACP_01.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_000_confidence_for_ACP_01.mpsr
@@ -24,7 +24,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_010_plain_text_gsn.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_010_plain_text_gsn.mpsr
index fd7eb5059..b181a5c3a 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_010_plain_text_gsn.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_010_plain_text_gsn.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -52,7 +52,7 @@
       </concept>
     </language>
     <language id="83ed2dfe-f724-46cc-852a-dce086daee3f" name="com.mbeddr.formal.base">
-      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ng" index="2U2l5L">
+      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ngI" index="2U2l5L">
         <child id="7402587364850275470" name="attributes" index="2U2l5M" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_011_plain_text_cae.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_011_plain_text_cae.mpsr
index a26b4e3bf..69335c303 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_011_plain_text_cae.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_011_plain_text_cae.mpsr
@@ -24,7 +24,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -61,7 +61,7 @@
       </concept>
     </language>
     <language id="83ed2dfe-f724-46cc-852a-dce086daee3f" name="com.mbeddr.formal.base">
-      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ng" index="2U2l5L">
+      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ngI" index="2U2l5L">
         <child id="7402587364850275470" name="attributes" index="2U2l5M" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_020_patterns_instantiated_from_library.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_020_patterns_instantiated_from_library.mpsr
index 8e69e60b0..8bffd4f85 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_020_patterns_instantiated_from_library.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_020_patterns_instantiated_from_library.mpsr
@@ -30,7 +30,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -67,13 +67,13 @@
       </concept>
     </language>
     <language id="83ed2dfe-f724-46cc-852a-dce086daee3f" name="com.mbeddr.formal.base">
-      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ng" index="2U2l5L">
+      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ngI" index="2U2l5L">
         <child id="7402587364850275470" name="attributes" index="2U2l5M" />
       </concept>
       <concept id="3687474483974639519" name="com.mbeddr.formal.base.structure.GenericAttributeAnnotationProviderBase" flags="ng" index="2Wz8ku">
         <property id="3687474483974749023" name="attributeConceptNodeID" index="2Wzj7u" />
       </concept>
-      <concept id="3687474483974128093" name="com.mbeddr.formal.base.structure.IAnnotationProvidersContainer" flags="ng" index="2WHcHs">
+      <concept id="3687474483974128093" name="com.mbeddr.formal.base.structure.IAnnotationProvidersContainer" flags="ngI" index="2WHcHs">
         <child id="3687474483974128095" name="annotationProviders" index="2WHcHu" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_030_confidence_dempster_schafer_evidence_annotated_with_confidence.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_030_confidence_dempster_schafer_evidence_annotated_with_confidence.mpsr
index d21f0e8a3..c7301a683 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_030_confidence_dempster_schafer_evidence_annotated_with_confidence.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_030_confidence_dempster_schafer_evidence_annotated_with_confidence.mpsr
@@ -24,7 +24,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -60,7 +60,7 @@
       </concept>
     </language>
     <language id="83ed2dfe-f724-46cc-852a-dce086daee3f" name="com.mbeddr.formal.base">
-      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ng" index="2U2l5L">
+      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ngI" index="2U2l5L">
         <child id="7402587364850275470" name="attributes" index="2U2l5M" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_031_confidence_dempster_schafer_confidence_as_specification.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_031_confidence_dempster_schafer_confidence_as_specification.mpsr
index f63e8b51e..0b37503f1 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_031_confidence_dempster_schafer_confidence_as_specification.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_031_confidence_dempster_schafer_confidence_as_specification.mpsr
@@ -21,7 +21,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -58,11 +58,11 @@
       </concept>
     </language>
     <language id="83ed2dfe-f724-46cc-852a-dce086daee3f" name="com.mbeddr.formal.base">
-      <concept id="4445845612600281072" name="com.mbeddr.formal.base.structure.IContainerForEntitiesWithPrefixedNames" flags="ng" index="2GXxrR">
+      <concept id="4445845612600281072" name="com.mbeddr.formal.base.structure.IContainerForEntitiesWithPrefixedNames" flags="ngI" index="2GXxrR">
         <property id="3731513482755311319" name="crtMaxIndex" index="3dZJ_E" />
         <property id="3731513482755309878" name="idPrefix" index="3dZJUb" />
       </concept>
-      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ng" index="2U2l5L">
+      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ngI" index="2U2l5L">
         <child id="7402587364850275470" name="attributes" index="2U2l5M" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_040_confidence_assurance_claim_points.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_040_confidence_assurance_claim_points.mpsr
index 04ee68add..ebeca2608 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_040_confidence_assurance_claim_points.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_040_confidence_assurance_claim_points.mpsr
@@ -20,7 +20,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_050_linking_solutions_to_external_documents.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_050_linking_solutions_to_external_documents.mpsr
index 257cff8b5..75802ae8c 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_050_linking_solutions_to_external_documents.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_050_linking_solutions_to_external_documents.mpsr
@@ -21,7 +21,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_051_cae_linking_evidence_to_external_ressources.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_051_cae_linking_evidence_to_external_ressources.mpsr
index b574c0caa..1ddc745e4 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_051_cae_linking_evidence_to_external_ressources.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_051_cae_linking_evidence_to_external_ressources.mpsr
@@ -31,7 +31,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -39,7 +39,7 @@
       <concept id="2210355370893864968" name="com.mbeddr.formal.safety.gsn.external_evidence.structure.URLEvidenceDocument" flags="ng" index="2Fbr9R">
         <property id="2210355370893864971" name="url" index="2Fbr9O" />
       </concept>
-      <concept id="2210355370893864965" name="com.mbeddr.formal.safety.gsn.external_evidence.structure.IExternalRessourceDocument" flags="ng" index="2Fbr9U">
+      <concept id="2210355370893864965" name="com.mbeddr.formal.safety.gsn.external_evidence.structure.IExternalRessourceDocument" flags="ngI" index="2Fbr9U">
         <child id="2210355370893974680" name="explanation" index="2FbXVB" />
       </concept>
       <concept id="4043927170651692617" name="com.mbeddr.formal.safety.gsn.external_evidence.structure.ExternalEvidenceDocument" flags="ng" index="K87gv">
@@ -92,7 +92,7 @@
       </concept>
     </language>
     <language id="83ed2dfe-f724-46cc-852a-dce086daee3f" name="com.mbeddr.formal.base">
-      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ng" index="2U2l5L">
+      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ngI" index="2U2l5L">
         <child id="7402587364850275470" name="attributes" index="2U2l5M" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_060_linking_solutions_to_external_tools.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_060_linking_solutions_to_external_tools.mpsr
index 09418ab6f..ed0161b80 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_060_linking_solutions_to_external_tools.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_060_linking_solutions_to_external_tools.mpsr
@@ -21,7 +21,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -72,7 +72,7 @@
       <concept id="4266958635905286484" name="com.mbeddr.formal.safety.gsn.structure.GoalStructureElementBase" flags="ng" index="2vnc$h">
         <child id="4266958635905312315" name="text" index="2vnaTY" />
       </concept>
-      <concept id="8242542213102376275" name="com.mbeddr.formal.safety.gsn.structure.IUpdateableSolution" flags="ng" index="2wgB4F">
+      <concept id="8242542213102376275" name="com.mbeddr.formal.safety.gsn.structure.IUpdateableSolution" flags="ngI" index="2wgB4F">
         <property id="4946522816140915512" name="hashCode" index="1_P2tN" />
         <property id="4946522816140921955" name="dateShort" index="1_P5wC" />
         <property id="4946522816140921857" name="success" index="1_P5xa" />
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_100_compliance_argument_to_iso26262.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_100_compliance_argument_to_iso26262.mpsr
index 94d971f34..fc65ac2fa 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_100_compliance_argument_to_iso26262.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_100_compliance_argument_to_iso26262.mpsr
@@ -26,7 +26,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -54,16 +54,16 @@
       </concept>
     </language>
     <language id="83ed2dfe-f724-46cc-852a-dce086daee3f" name="com.mbeddr.formal.base">
-      <concept id="4445845612600281072" name="com.mbeddr.formal.base.structure.IContainerForEntitiesWithPrefixedNames" flags="ng" index="2GXxrR">
+      <concept id="4445845612600281072" name="com.mbeddr.formal.base.structure.IContainerForEntitiesWithPrefixedNames" flags="ngI" index="2GXxrR">
         <property id="3731513482755311319" name="crtMaxIndex" index="3dZJ_E" />
       </concept>
-      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ng" index="2U2l5L">
+      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ngI" index="2U2l5L">
         <child id="7402587364850275470" name="attributes" index="2U2l5M" />
       </concept>
       <concept id="3687474483974639519" name="com.mbeddr.formal.base.structure.GenericAttributeAnnotationProviderBase" flags="ng" index="2Wz8ku">
         <property id="3687474483974749023" name="attributeConceptNodeID" index="2Wzj7u" />
       </concept>
-      <concept id="3687474483974128093" name="com.mbeddr.formal.base.structure.IAnnotationProvidersContainer" flags="ng" index="2WHcHs">
+      <concept id="3687474483974128093" name="com.mbeddr.formal.base.structure.IAnnotationProvidersContainer" flags="ngI" index="2WHcHs">
         <child id="3687474483974128095" name="annotationProviders" index="2WHcHu" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_900_iso26262_safety_standard.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_900_iso26262_safety_standard.mpsr
index 8dda98291..df4094d88 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_900_iso26262_safety_standard.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases/_900_iso26262_safety_standard.mpsr
@@ -10,7 +10,7 @@
       <concept id="3731513482756195661" name="com.mbeddr.formal.safety.argument.process.structure.Standard" flags="ng" index="3dyRFK">
         <child id="3731513482756244090" name="clauses" index="3dzbR7" />
       </concept>
-      <concept id="3731513482756195662" name="com.mbeddr.formal.safety.argument.process.structure.IBibliographyEntry" flags="ng" index="3dyRFN">
+      <concept id="3731513482756195662" name="com.mbeddr.formal.safety.argument.process.structure.IBibliographyEntry" flags="ngI" index="3dyRFN">
         <property id="3731513482756243948" name="publicationYear" index="3dzbTh" />
         <property id="3731513482756243946" name="longTitle" index="3dzbTn" />
       </concept>
@@ -20,7 +20,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._051_structured_assurance_cases_doc/_016_goal_structure_explanation.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._051_structured_assurance_cases_doc/_016_goal_structure_explanation.mpsr
index ec465cf12..beff975e4 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._051_structured_assurance_cases_doc/_016_goal_structure_explanation.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._051_structured_assurance_cases_doc/_016_goal_structure_explanation.mpsr
@@ -22,7 +22,7 @@
       <concept id="5785245534400277706" name="com.mbeddr.doc.structure.TextBlockTableCell" flags="ng" index="C7FVz">
         <child id="5785245534400277707" name="text" index="C7FVy" />
       </concept>
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
       </concept>
       <concept id="2286331641395252232" name="com.mbeddr.doc.structure.NamedNodeModelContentPointerElement" flags="ng" index="2NCMab">
@@ -46,7 +46,7 @@
         <property id="6955693250238922823" name="showContents" index="3z_lpJ" />
         <child id="6955693250238922822" name="codeptr" index="3z_lpI" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
       <concept id="3350625596580064222" name="com.mbeddr.doc.structure.AbstractSection" flags="ng" index="1_0VJ$">
@@ -72,7 +72,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._051_structured_assurance_cases_doc/conf.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._051_structured_assurance_cases_doc/conf.mpsr
index de73d54e7..c72b5e8aa 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._051_structured_assurance_cases_doc/conf.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._051_structured_assurance_cases_doc/conf.mpsr
@@ -28,7 +28,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._051_structured_assurance_cases_doc/export.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._051_structured_assurance_cases_doc/export.mpsr
index c63194e44..3d195df00 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._051_structured_assurance_cases_doc/export.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._051_structured_assurance_cases_doc/export.mpsr
@@ -29,7 +29,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._052_structured_assurance_import_csv/csv_demo.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._052_structured_assurance_import_csv/csv_demo.mpsr
index c9cc866b3..c219a56db 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._052_structured_assurance_import_csv/csv_demo.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._052_structured_assurance_import_csv/csv_demo.mpsr
@@ -18,7 +18,7 @@
       <concept id="6156524541423588207" name="com.mbeddr.mpsutil.filepicker.structure.SolutionRelativeFilePicker" flags="ng" index="3NXOOs" />
     </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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._052_structured_assurance_import_xml/import_xml.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._052_structured_assurance_import_xml/import_xml.mpsr
index 08729b3e1..65d83cd44 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._052_structured_assurance_import_xml/import_xml.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._052_structured_assurance_import_xml/import_xml.mpsr
@@ -18,7 +18,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_cae/HARA Reusable Entities.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_cae/HARA Reusable Entities.mpsr
index d7e52b390..02557efe9 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_cae/HARA Reusable Entities.mpsr	
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_cae/HARA Reusable Entities.mpsr	
@@ -26,7 +26,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_cae/_010_pattern_instantiation.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_cae/_010_pattern_instantiation.mpsr
index 1d4cbc68f..2c562c6ae 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_cae/_010_pattern_instantiation.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_cae/_010_pattern_instantiation.mpsr
@@ -7,7 +7,7 @@
       <concept id="5489462543707440098" name="com.mbeddr.formal.safety.gsn.ext.structure.TemplateWord" flags="ng" index="hkfVV">
         <child id="4266958635905312315" name="text" index="2vnaTY" />
       </concept>
-      <concept id="9296093158641125" name="com.mbeddr.formal.safety.gsn.ext.structure.ILibraryEntityRef" flags="ng" index="1qD0Hq">
+      <concept id="9296093158641125" name="com.mbeddr.formal.safety.gsn.ext.structure.ILibraryEntityRef" flags="ngI" index="1qD0Hq">
         <reference id="9296093158689453" name="entityDefinition" index="1qDcKi" />
       </concept>
       <concept id="1629165016568013909" name="com.mbeddr.formal.safety.gsn.ext.structure.PatternInstance" flags="ng" index="1VB52A">
@@ -37,7 +37,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_gsn/Component Is Correctly Implemented.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_gsn/Component Is Correctly Implemented.mpsr
index 740881ba5..ff9c3f076 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_gsn/Component Is Correctly Implemented.mpsr	
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_gsn/Component Is Correctly Implemented.mpsr	
@@ -22,7 +22,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_gsn/Process Level Reusable Entities.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_gsn/Process Level Reusable Entities.mpsr
index ba7360370..b7124492f 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_gsn/Process Level Reusable Entities.mpsr	
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_gsn/Process Level Reusable Entities.mpsr	
@@ -22,7 +22,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_gsn/_010_pattern_instantiation.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_gsn/_010_pattern_instantiation.mpsr
index dd3212845..0d0c9c42f 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_gsn/_010_pattern_instantiation.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_gsn/_010_pattern_instantiation.mpsr
@@ -21,7 +21,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_gsn/_020_library_entities_reuse.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_gsn/_020_library_entities_reuse.mpsr
index 7d00f34c3..801e056af 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_gsn/_020_library_entities_reuse.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_gsn/_020_library_entities_reuse.mpsr
@@ -5,7 +5,7 @@
   <registry>
     <language id="6464626a-ab04-4051-908e-5e8dc75acd78" name="com.mbeddr.formal.safety.gsn.ext">
       <concept id="9296093157844055" name="com.mbeddr.formal.safety.gsn.ext.structure.LibraryGoalRef" flags="ng" index="1qmubC" />
-      <concept id="9296093158641125" name="com.mbeddr.formal.safety.gsn.ext.structure.ILibraryEntityRef" flags="ng" index="1qD0Hq">
+      <concept id="9296093158641125" name="com.mbeddr.formal.safety.gsn.ext.structure.ILibraryEntityRef" flags="ngI" index="1qD0Hq">
         <reference id="9296093158689453" name="entityDefinition" index="1qDcKi" />
       </concept>
     </language>
@@ -21,7 +21,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._070_assurance_cases_linked_to_artifacts_models/_010_implanatable_medical_devices_team.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._070_assurance_cases_linked_to_artifacts_models/_010_implanatable_medical_devices_team.mpsr
index fc65331e3..0fcfa5d71 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._070_assurance_cases_linked_to_artifacts_models/_010_implanatable_medical_devices_team.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._070_assurance_cases_linked_to_artifacts_models/_010_implanatable_medical_devices_team.mpsr
@@ -16,7 +16,7 @@
         <child id="1574221925581155720" name="persons" index="UfqW8" />
         <child id="1639692281461243285" name="roleDefinitions" index="1vGMr$" />
       </concept>
-      <concept id="1574221925581136306" name="com.mbeddr.formal.safety.argument.process.artefacts.structure.IArtefactElement" flags="ng" index="UfucM">
+      <concept id="1574221925581136306" name="com.mbeddr.formal.safety.argument.process.artefacts.structure.IArtefactElement" flags="ngI" index="UfucM">
         <property id="1574221925581155631" name="id" index="UfqYJ" />
       </concept>
       <concept id="1639692281461243256" name="com.mbeddr.formal.safety.argument.process.artefacts.structure.RoleRef" flags="ng" index="1vGMo9">
@@ -28,7 +28,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._070_assurance_cases_linked_to_artifacts_models/_011_implanatable_medical_devices_safety_team.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._070_assurance_cases_linked_to_artifacts_models/_011_implanatable_medical_devices_safety_team.mpsr
index f7abf68f2..0e852b88f 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._070_assurance_cases_linked_to_artifacts_models/_011_implanatable_medical_devices_safety_team.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._070_assurance_cases_linked_to_artifacts_models/_011_implanatable_medical_devices_safety_team.mpsr
@@ -17,7 +17,7 @@
         <child id="1574221925581155720" name="persons" index="UfqW8" />
         <child id="1639692281461243285" name="roleDefinitions" index="1vGMr$" />
       </concept>
-      <concept id="1574221925581136306" name="com.mbeddr.formal.safety.argument.process.artefacts.structure.IArtefactElement" flags="ng" index="UfucM">
+      <concept id="1574221925581136306" name="com.mbeddr.formal.safety.argument.process.artefacts.structure.IArtefactElement" flags="ngI" index="UfucM">
         <property id="1574221925581155631" name="id" index="UfqYJ" />
       </concept>
       <concept id="1639692281461243256" name="com.mbeddr.formal.safety.argument.process.artefacts.structure.RoleRef" flags="ng" index="1vGMo9">
@@ -29,7 +29,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._070_assurance_cases_linked_to_artifacts_models/_011_implanatable_medical_devices_software_team.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._070_assurance_cases_linked_to_artifacts_models/_011_implanatable_medical_devices_software_team.mpsr
index e6818cfb6..239c25c01 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._070_assurance_cases_linked_to_artifacts_models/_011_implanatable_medical_devices_software_team.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._070_assurance_cases_linked_to_artifacts_models/_011_implanatable_medical_devices_software_team.mpsr
@@ -17,7 +17,7 @@
         <child id="1574221925581155720" name="persons" index="UfqW8" />
         <child id="1639692281461243285" name="roleDefinitions" index="1vGMr$" />
       </concept>
-      <concept id="1574221925581136306" name="com.mbeddr.formal.safety.argument.process.artefacts.structure.IArtefactElement" flags="ng" index="UfucM">
+      <concept id="1574221925581136306" name="com.mbeddr.formal.safety.argument.process.artefacts.structure.IArtefactElement" flags="ngI" index="UfucM">
         <property id="1574221925581155631" name="id" index="UfqYJ" />
       </concept>
       <concept id="1639692281461243256" name="com.mbeddr.formal.safety.argument.process.artefacts.structure.RoleRef" flags="ng" index="1vGMo9">
@@ -29,7 +29,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._070_assurance_cases_linked_to_artifacts_models/_011_implanatable_medical_devices_system_team.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._070_assurance_cases_linked_to_artifacts_models/_011_implanatable_medical_devices_system_team.mpsr
index a9ae4ea3b..1c89443dc 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._070_assurance_cases_linked_to_artifacts_models/_011_implanatable_medical_devices_system_team.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._070_assurance_cases_linked_to_artifacts_models/_011_implanatable_medical_devices_system_team.mpsr
@@ -17,7 +17,7 @@
         <child id="1574221925581155720" name="persons" index="UfqW8" />
         <child id="1639692281461243285" name="roleDefinitions" index="1vGMr$" />
       </concept>
-      <concept id="1574221925581136306" name="com.mbeddr.formal.safety.argument.process.artefacts.structure.IArtefactElement" flags="ng" index="UfucM">
+      <concept id="1574221925581136306" name="com.mbeddr.formal.safety.argument.process.artefacts.structure.IArtefactElement" flags="ngI" index="UfucM">
         <property id="1574221925581155631" name="id" index="UfqYJ" />
       </concept>
       <concept id="1639692281461243256" name="com.mbeddr.formal.safety.argument.process.artefacts.structure.RoleRef" flags="ng" index="1vGMo9">
@@ -29,7 +29,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._080_assurance_cases_linked_to_jira/_010_legs_without_evidence.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._080_assurance_cases_linked_to_jira/_010_legs_without_evidence.mpsr
index 5dc341bed..569e055fe 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._080_assurance_cases_linked_to_jira/_010_legs_without_evidence.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._080_assurance_cases_linked_to_jira/_010_legs_without_evidence.mpsr
@@ -19,7 +19,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._080_assurance_cases_linked_to_jira/_100_Known_Issues.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._080_assurance_cases_linked_to_jira/_100_Known_Issues.mpsr
index 1c484b100..aa8aca5b2 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._080_assurance_cases_linked_to_jira/_100_Known_Issues.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._080_assurance_cases_linked_to_jira/_100_Known_Issues.mpsr
@@ -25,7 +25,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -61,13 +61,13 @@
       </concept>
     </language>
     <language id="83ed2dfe-f724-46cc-852a-dce086daee3f" name="com.mbeddr.formal.base">
-      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ng" index="2U2l5L">
+      <concept id="7402587364850275469" name="com.mbeddr.formal.base.structure.IAttributeContainer" flags="ngI" index="2U2l5L">
         <child id="7402587364850275470" name="attributes" index="2U2l5M" />
       </concept>
       <concept id="3687474483974639519" name="com.mbeddr.formal.base.structure.GenericAttributeAnnotationProviderBase" flags="ng" index="2Wz8ku">
         <property id="3687474483974749023" name="attributeConceptNodeID" index="2Wzj7u" />
       </concept>
-      <concept id="3687474483974128093" name="com.mbeddr.formal.base.structure.IAnnotationProvidersContainer" flags="ng" index="2WHcHs">
+      <concept id="3687474483974128093" name="com.mbeddr.formal.base.structure.IAnnotationProvidersContainer" flags="ngI" index="2WHcHs">
         <child id="3687474483974128095" name="annotationProviders" index="2WHcHu" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._080_assurance_cases_linked_to_jira/access_config.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._080_assurance_cases_linked_to_jira/access_config.mpsr
index 28946422e..9879fd3b4 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._080_assurance_cases_linked_to_jira/access_config.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._080_assurance_cases_linked_to_jira/access_config.mpsr
@@ -9,7 +9,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/.model b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/.model
index 8a3ffee37..5a7d1c07c 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/.model
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/.model
@@ -9,6 +9,7 @@
     <devkit ref="ac9a2847-3512-4af0-8db9-c20abbe2720a(fasten.safety)" />
     <devkit ref="5a50cadb-4d6e-4722-b5f5-c6b9efb22ffe(fasten.safety.gsn.formal)" />
     <devkit ref="7466bc49-e775-4df7-a9f3-e383173b2eee(fasten.safety.gsn.ext)" />
+    <devkit ref="5e597493-feae-41d8-b052-3b0a41743991(fasten.safety.gsn.patterns)" />
   </languages>
   <imports>
     <import index="6r4f" ref="r:975e4969-1ce0-4ded-8867-b40b46ebd140(_010_patterns_catalogue)" />
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_010_airbag_functional_requirements.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_010_airbag_functional_requirements.mpsr
index d608fad83..100fd3d85 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_010_airbag_functional_requirements.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_010_airbag_functional_requirements.mpsr
@@ -39,7 +39,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_020_airbag_hazards_list.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_020_airbag_hazards_list.mpsr
index 5a9d69939..aa5039bcd 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_020_airbag_hazards_list.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_020_airbag_hazards_list.mpsr
@@ -4,16 +4,16 @@
   <imports />
   <registry>
     <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">
+      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ngI" 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">
+      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ngI" index="8gIbW">
         <child id="9102875167978228305" name="hazards" index="8gIbH" />
       </concept>
       <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="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_021_airbag_operational_situations.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_021_airbag_operational_situations.mpsr
index 076539084..46afd3442 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_021_airbag_operational_situations.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_021_airbag_operational_situations.mpsr
@@ -12,7 +12,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_030_airbag_safety_requirements_h1.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_030_airbag_safety_requirements_h1.mpsr
index db6787cea..590b697d0 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_030_airbag_safety_requirements_h1.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_030_airbag_safety_requirements_h1.mpsr
@@ -42,7 +42,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_030_airbag_safety_requirements_h2.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_030_airbag_safety_requirements_h2.mpsr
index 6a5bff21b..bbecb4db0 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_030_airbag_safety_requirements_h2.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_030_airbag_safety_requirements_h2.mpsr
@@ -41,7 +41,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_040_airbag_cbd.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_040_airbag_cbd.mpsr
index f668972dd..4117f3ae9 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_040_airbag_cbd.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_040_airbag_cbd.mpsr
@@ -77,7 +77,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -110,7 +110,7 @@
       </concept>
     </language>
     <language id="71797868-de95-425c-8470-36aa52c8ebc4" name="com.mbeddr.formal.base.arch">
-      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ng" index="3Ic8zf">
+      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ngI" index="3Ic8zf">
         <child id="9066112305507315710" name="contracts" index="3UnIb_" />
       </concept>
       <concept id="9066112305507423291" name="com.mbeddr.formal.base.arch.structure.Connection" flags="ng" index="3Ug1$w">
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_040_airbag_implementation_device.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_040_airbag_implementation_device.mpsr
index b78b291c1..6c110fca2 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_040_airbag_implementation_device.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_040_airbag_implementation_device.mpsr
@@ -81,7 +81,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_040_airbag_implementation_link.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_040_airbag_implementation_link.mpsr
index 68e8e1129..9a22a2f68 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_040_airbag_implementation_link.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_040_airbag_implementation_link.mpsr
@@ -61,7 +61,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_040_airbag_implementation_sensor.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_040_airbag_implementation_sensor.mpsr
index 5930253c4..185e33741 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_040_airbag_implementation_sensor.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_040_airbag_implementation_sensor.mpsr
@@ -89,7 +89,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_100_toplevel_safety_arg_pattern.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_100_toplevel_safety_arg_pattern.mpsr
index 77b321a59..0c83aad24 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_100_toplevel_safety_arg_pattern.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_100_toplevel_safety_arg_pattern.mpsr
@@ -38,7 +38,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_110_contract_based_design_arg_pattern.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_110_contract_based_design_arg_pattern.mpsr
index f3b55dd4f..9107ecf91 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_110_contract_based_design_arg_pattern.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo/_110_contract_based_design_arg_pattern.mpsr
@@ -33,7 +33,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -81,7 +81,7 @@
       <concept id="4266958635905286484" name="com.mbeddr.formal.safety.gsn.structure.GoalStructureElementBase" flags="ng" index="2vnc$h">
         <child id="4266958635905312315" name="text" index="2vnaTY" />
       </concept>
-      <concept id="8242542213102376275" name="com.mbeddr.formal.safety.gsn.structure.IUpdateableSolution" flags="ng" index="2wgB4F">
+      <concept id="8242542213102376275" name="com.mbeddr.formal.safety.gsn.structure.IUpdateableSolution" flags="ngI" index="2wgB4F">
         <property id="4946522816140915512" name="hashCode" index="1_P2tN" />
         <property id="4946522816140921955" name="dateShort" index="1_P5wC" />
         <property id="4946522816140921857" name="success" index="1_P5xa" />
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_001_case_study_description.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_001_case_study_description.mpsr
index 74573b0fd..324db8a2d 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_001_case_study_description.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_001_case_study_description.mpsr
@@ -19,7 +19,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_002_state_model.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_002_state_model.mpsr
index 768b84bad..ebdb3f419 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_002_state_model.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_002_state_model.mpsr
@@ -125,7 +125,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -162,7 +162,7 @@
       </concept>
     </language>
     <language id="71797868-de95-425c-8470-36aa52c8ebc4" name="com.mbeddr.formal.base.arch">
-      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ng" index="3Ic8zf">
+      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ngI" index="3Ic8zf">
         <child id="9066112305507315710" name="contracts" index="3UnIb_" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_003_ladekabel_system_requirements.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_003_ladekabel_system_requirements.mpsr
index 3d122265c..f40775614 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_003_ladekabel_system_requirements.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_003_ladekabel_system_requirements.mpsr
@@ -43,7 +43,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_004_ladekabel_functional_requirements.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_004_ladekabel_functional_requirements.mpsr
index 86ab1451e..a95d8f4b3 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_004_ladekabel_functional_requirements.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_004_ladekabel_functional_requirements.mpsr
@@ -41,7 +41,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_005_operational_situations.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_005_operational_situations.mpsr
index 87db22d25..2c6a98c0b 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_005_operational_situations.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_005_operational_situations.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_020_charging_cable_losses.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_020_charging_cable_losses.mpsr
index e4bff4127..a2387c3cc 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_020_charging_cable_losses.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_020_charging_cable_losses.mpsr
@@ -12,7 +12,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_022_charging_cable_hazards_list.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_022_charging_cable_hazards_list.mpsr
index b975da766..a754aa576 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_022_charging_cable_hazards_list.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_022_charging_cable_hazards_list.mpsr
@@ -4,10 +4,10 @@
   <imports />
   <registry>
     <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">
+      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ngI" 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">
+      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ngI" 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">
@@ -19,7 +19,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_025_charging_cable_control_structure.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_025_charging_cable_control_structure.mpsr
index 28511dd17..fbbafafd5 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_025_charging_cable_control_structure.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_025_charging_cable_control_structure.mpsr
@@ -32,7 +32,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_026_charging_cable_unsafe_control_actions.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_026_charging_cable_unsafe_control_actions.mpsr
index a3635fc28..3c4102728 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_026_charging_cable_unsafe_control_actions.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_026_charging_cable_unsafe_control_actions.mpsr
@@ -49,7 +49,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_030_ladekabel_functional_safety_requirements_H01.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_030_ladekabel_functional_safety_requirements_H01.mpsr
index aa5e7e945..0a10dfd8c 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_030_ladekabel_functional_safety_requirements_H01.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_030_ladekabel_functional_safety_requirements_H01.mpsr
@@ -41,7 +41,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_030_ladekabel_functional_safety_requirements_H03.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_030_ladekabel_functional_safety_requirements_H03.mpsr
index d7c39bcf8..dd1ffa077 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_030_ladekabel_functional_safety_requirements_H03.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_030_ladekabel_functional_safety_requirements_H03.mpsr
@@ -44,7 +44,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_040_ladekabel_technical_requirements.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_040_ladekabel_technical_requirements.mpsr
index ca3667813..1fbfc7737 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_040_ladekabel_technical_requirements.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_040_ladekabel_technical_requirements.mpsr
@@ -35,7 +35,7 @@
       <concept id="7998766141987822488" name="com.mbeddr.formal.safety.req.structure.TechnicalSafetyReqKind" flags="ng" index="DA$zP" />
     </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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_050_system_arch.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_050_system_arch.mpsr
index 5f8775d95..218115123 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_050_system_arch.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_050_system_arch.mpsr
@@ -70,7 +70,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -103,7 +103,7 @@
       </concept>
     </language>
     <language id="71797868-de95-425c-8470-36aa52c8ebc4" name="com.mbeddr.formal.base.arch">
-      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ng" index="3Ic8zf">
+      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ngI" index="3Ic8zf">
         <child id="9066112305507315710" name="contracts" index="3UnIb_" />
       </concept>
       <concept id="9066112305507423291" name="com.mbeddr.formal.base.arch.structure.Connection" flags="ng" index="3Ug1$w">
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_100_top_level_safety_argumentation.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_100_top_level_safety_argumentation.mpsr
index 8d8c95462..548fb9d38 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_100_top_level_safety_argumentation.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable/_100_top_level_safety_argumentation.mpsr
@@ -42,7 +42,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_000_lk_item_definition.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_000_lk_item_definition.mpsr
index fce448ed6..00f48704e 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_000_lk_item_definition.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_000_lk_item_definition.mpsr
@@ -18,7 +18,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_010_lk_functional_requirements.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_010_lk_functional_requirements.mpsr
index 2bc254aa4..62ab06c65 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_010_lk_functional_requirements.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_010_lk_functional_requirements.mpsr
@@ -46,7 +46,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_020_lk_system_requirements.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_020_lk_system_requirements.mpsr
index dcaf94c4d..f9b84727c 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_020_lk_system_requirements.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_020_lk_system_requirements.mpsr
@@ -36,7 +36,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_030_operational_situations.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_030_operational_situations.mpsr
index 75174e663..32bf05e86 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_030_operational_situations.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_030_operational_situations.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_101_lane_keeping_hazard_list_ASIL_A_H04.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_101_lane_keeping_hazard_list_ASIL_A_H04.mpsr
index a5a9dbd89..acb250a0c 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_101_lane_keeping_hazard_list_ASIL_A_H04.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_101_lane_keeping_hazard_list_ASIL_A_H04.mpsr
@@ -4,10 +4,10 @@
   <imports />
   <registry>
     <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">
+      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ngI" 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">
+      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ngI" 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">
@@ -19,7 +19,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_102_LKA_losses_list.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_102_LKA_losses_list.mpsr
index 8ab8896e8..05a70add9 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_102_LKA_losses_list.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_102_LKA_losses_list.mpsr
@@ -12,7 +12,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_103_safety_assurance_lane_keeping_control_structure.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_103_safety_assurance_lane_keeping_control_structure.mpsr
index 4f2ce4ff5..4a8e6ef1d 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_103_safety_assurance_lane_keeping_control_structure.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_103_safety_assurance_lane_keeping_control_structure.mpsr
@@ -23,7 +23,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_104_safety_assurance_lane_keeping_unsafe_control_actions.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_104_safety_assurance_lane_keeping_unsafe_control_actions.mpsr
index 53fa7307e..4c1448363 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_104_safety_assurance_lane_keeping_unsafe_control_actions.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_104_safety_assurance_lane_keeping_unsafe_control_actions.mpsr
@@ -40,7 +40,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_201_safety_goals_Camera-and-Image-Processing.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_201_safety_goals_Camera-and-Image-Processing.mpsr
index ba5cec685..046b6e62c 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_201_safety_goals_Camera-and-Image-Processing.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_201_safety_goals_Camera-and-Image-Processing.mpsr
@@ -42,7 +42,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_202_FunctionalSafetyRequirements_Camera-and-Image-Processing.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_202_FunctionalSafetyRequirements_Camera-and-Image-Processing.mpsr
index b353acec7..d5869cac4 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_202_FunctionalSafetyRequirements_Camera-and-Image-Processing.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_202_FunctionalSafetyRequirements_Camera-and-Image-Processing.mpsr
@@ -52,7 +52,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_203_safety_goals_LKA_controller.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_203_safety_goals_LKA_controller.mpsr
index e61f370b9..a87b257f8 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_203_safety_goals_LKA_controller.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_203_safety_goals_LKA_controller.mpsr
@@ -42,7 +42,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_204_FunctionalSafetyRequirements_LKA_controller.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_204_FunctionalSafetyRequirements_LKA_controller.mpsr
index b500ee917..8f45cd34c 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_204_FunctionalSafetyRequirements_LKA_controller.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_204_FunctionalSafetyRequirements_LKA_controller.mpsr
@@ -53,7 +53,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_205_LKA_functional_architecture.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_205_LKA_functional_architecture.mpsr
index bbbb73c26..63c34882f 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_205_LKA_functional_architecture.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_205_LKA_functional_architecture.mpsr
@@ -87,7 +87,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -120,7 +120,7 @@
       </concept>
     </language>
     <language id="71797868-de95-425c-8470-36aa52c8ebc4" name="com.mbeddr.formal.base.arch">
-      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ng" index="3Ic8zf">
+      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ngI" index="3Ic8zf">
         <child id="9066112305507315710" name="contracts" index="3UnIb_" />
       </concept>
       <concept id="9066112305507423291" name="com.mbeddr.formal.base.arch.structure.Connection" flags="ng" index="3Ug1$w">
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_206_LKA_implementation.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_206_LKA_implementation.mpsr
index 207f7087f..c6fd1ee6e 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_206_LKA_implementation.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_206_LKA_implementation.mpsr
@@ -76,7 +76,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_302_TechnicalSafetyRequirements_Camera_and_Image_Processing.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_302_TechnicalSafetyRequirements_Camera_and_Image_Processing.mpsr
index ca44ec7c4..7e5e05fa2 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_302_TechnicalSafetyRequirements_Camera_and_Image_Processing.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_302_TechnicalSafetyRequirements_Camera_and_Image_Processing.mpsr
@@ -43,7 +43,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_303_TechnicalSafetyRequirements_LKA_Controller.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_303_TechnicalSafetyRequirements_LKA_Controller.mpsr
index 4c5f47b6d..f02d65323 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_303_TechnicalSafetyRequirements_LKA_Controller.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_303_TechnicalSafetyRequirements_LKA_Controller.mpsr
@@ -47,7 +47,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_401_safety_goals_camera_and_image_processing.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_401_safety_goals_camera_and_image_processing.mpsr
index 67f6e4101..ead10d0ee 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_401_safety_goals_camera_and_image_processing.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_401_safety_goals_camera_and_image_processing.mpsr
@@ -20,7 +20,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_402_safety_goals_LKA_controller.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_402_safety_goals_LKA_controller.mpsr
index 6f4c3d8b7..f0fa9506f 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_402_safety_goals_LKA_controller.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_402_safety_goals_LKA_controller.mpsr
@@ -20,7 +20,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_lane_keeping_L05_control_structure.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_lane_keeping_L05_control_structure.mpsr
index 803f46d99..766f9e6f0 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_lane_keeping_L05_control_structure.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_lane_keeping_L05_control_structure.mpsr
@@ -23,7 +23,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_lane_keeping_L05_unsafe_control_analysis.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_lane_keeping_L05_unsafe_control_analysis.mpsr
index b3e3c2582..edbc23ad5 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_lane_keeping_L05_unsafe_control_analysis.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping/_lane_keeping_L05_unsafe_control_analysis.mpsr
@@ -40,7 +40,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_000_acc_item_definition.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_000_acc_item_definition.mpsr
index bf7ada0fd..5f3e3c81f 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_000_acc_item_definition.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_000_acc_item_definition.mpsr
@@ -19,7 +19,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_010_acc_functional_requirements.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_010_acc_functional_requirements.mpsr
index e553d189e..e510eef51 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_010_acc_functional_requirements.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_010_acc_functional_requirements.mpsr
@@ -47,7 +47,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_020_acc_system_requirements.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_020_acc_system_requirements.mpsr
index ce43685d2..ec15eb435 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_020_acc_system_requirements.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_020_acc_system_requirements.mpsr
@@ -42,7 +42,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_030_operational_situations.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_030_operational_situations.mpsr
index e4fe174b0..a04608859 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_030_operational_situations.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_030_operational_situations.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_100_acc_losses_list.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_100_acc_losses_list.mpsr
index c64e9f4fe..5e6650b71 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_100_acc_losses_list.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_100_acc_losses_list.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_101_acc_hazards_list.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_101_acc_hazards_list.mpsr
index b5894f138..bd9251b38 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_101_acc_hazards_list.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_101_acc_hazards_list.mpsr
@@ -4,10 +4,10 @@
   <imports />
   <registry>
     <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">
+      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ngI" 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">
+      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ngI" 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">
@@ -22,7 +22,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_102_acc_safety_goals.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_102_acc_safety_goals.mpsr
index 44be41102..74a2e681e 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_102_acc_safety_goals.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_102_acc_safety_goals.mpsr
@@ -42,7 +42,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_103_acc_stpa_control_structure.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_103_acc_stpa_control_structure.mpsr
index 9dc35b120..ccca89e5b 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_103_acc_stpa_control_structure.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_103_acc_stpa_control_structure.mpsr
@@ -23,7 +23,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_104_acc_stpa_unsafe_control_actions.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_104_acc_stpa_unsafe_control_actions.mpsr
index 6765e0ab5..e13fad191 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_104_acc_stpa_unsafe_control_actions.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_104_acc_stpa_unsafe_control_actions.mpsr
@@ -43,7 +43,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_105_acc_stpa_loss_scenarios.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_105_acc_stpa_loss_scenarios.mpsr
index cb56f57c2..271ae8e18 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_105_acc_stpa_loss_scenarios.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_105_acc_stpa_loss_scenarios.mpsr
@@ -24,7 +24,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_200_acc_fsr.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_200_acc_fsr.mpsr
index 41f1b7780..f0372ec6b 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_200_acc_fsr.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_200_acc_fsr.mpsr
@@ -54,7 +54,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_201_acc_functional_architecture.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_201_acc_functional_architecture.mpsr
index fb82ea559..2d77c53ab 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_201_acc_functional_architecture.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_201_acc_functional_architecture.mpsr
@@ -91,7 +91,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -124,7 +124,7 @@
       </concept>
     </language>
     <language id="71797868-de95-425c-8470-36aa52c8ebc4" name="com.mbeddr.formal.base.arch">
-      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ng" index="3Ic8zf">
+      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ngI" index="3Ic8zf">
         <child id="9066112305507315710" name="contracts" index="3UnIb_" />
       </concept>
       <concept id="9066112305507423291" name="com.mbeddr.formal.base.arch.structure.Connection" flags="ng" index="3Ug1$w">
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_201_acc_implementation.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_201_acc_implementation.mpsr
index e87ebde34..d2dd6a92e 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_201_acc_implementation.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_201_acc_implementation.mpsr
@@ -104,7 +104,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_300_acc_tsr.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_300_acc_tsr.mpsr
index c901f726e..09990855c 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_300_acc_tsr.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_300_acc_tsr.mpsr
@@ -47,7 +47,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_400_acc_safety_case.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_400_acc_safety_case.mpsr
index 5c388f5a3..85d299c7f 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_400_acc_safety_case.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_400_acc_safety_case.mpsr
@@ -28,7 +28,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_410_acc_redundancy_argumentation.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_410_acc_redundancy_argumentation.mpsr
index 8307f0862..5c36e49f8 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_410_acc_redundancy_argumentation.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc/_410_acc_redundancy_argumentation.mpsr
@@ -20,7 +20,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/.model b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/.model
index 258381189..4cf6578b0 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/.model
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/.model
@@ -7,6 +7,7 @@
     <devkit ref="ac9a2847-3512-4af0-8db9-c20abbe2720a(fasten.safety)" />
     <devkit ref="edb51d2d-64eb-404a-818e-c1cabf1d58d5(fasten.nusmv)" />
     <devkit ref="5a50cadb-4d6e-4722-b5f5-c6b9efb22ffe(fasten.safety.gsn.formal)" />
+    <devkit ref="5e597493-feae-41d8-b052-3b0a41743991(fasten.safety.gsn.patterns)" />
   </languages>
   <imports>
     <import index="6r4f" ref="r:975e4969-1ce0-4ded-8867-b40b46ebd140(_010_patterns_catalogue)" />
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_000_eb_item_definition.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_000_eb_item_definition.mpsr
index e1b8acc04..dc3346362 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_000_eb_item_definition.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_000_eb_item_definition.mpsr
@@ -19,7 +19,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_010_eb_functional_requirements.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_010_eb_functional_requirements.mpsr
index 1a55055d7..7052fd805 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_010_eb_functional_requirements.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_010_eb_functional_requirements.mpsr
@@ -46,7 +46,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_020_eb_system_requirements.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_020_eb_system_requirements.mpsr
index 30f4f1fbb..9cfd09ecd 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_020_eb_system_requirements.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_020_eb_system_requirements.mpsr
@@ -37,7 +37,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_030_operational_situations.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_030_operational_situations.mpsr
index 0a39a980c..6b5011429 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_030_operational_situations.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_030_operational_situations.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_101_eb_hazard_list_ASIL_B_H03.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_101_eb_hazard_list_ASIL_B_H03.mpsr
index b79d2423f..41c554c1d 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_101_eb_hazard_list_ASIL_B_H03.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_101_eb_hazard_list_ASIL_B_H03.mpsr
@@ -4,10 +4,10 @@
   <imports />
   <registry>
     <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">
+      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ngI" 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">
+      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ngI" 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">
@@ -22,7 +22,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_102_eb_losses_list.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_102_eb_losses_list.mpsr
index e5ea9f165..fe8be3471 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_102_eb_losses_list.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_102_eb_losses_list.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_103_eb_control_structure.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_103_eb_control_structure.mpsr
index 8aa421e6f..970e9a0c8 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_103_eb_control_structure.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_103_eb_control_structure.mpsr
@@ -23,7 +23,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_104_eb_unsafe_control_actions.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_104_eb_unsafe_control_actions.mpsr
index e6c5a1225..95024097e 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_104_eb_unsafe_control_actions.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_104_eb_unsafe_control_actions.mpsr
@@ -40,7 +40,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_201_eb_safety_goals.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_201_eb_safety_goals.mpsr
index 18d4f262f..351625a71 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_201_eb_safety_goals.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_201_eb_safety_goals.mpsr
@@ -44,7 +44,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_202_eb_fsr.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_202_eb_fsr.mpsr
index 6c01ed994..2f3b46b62 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_202_eb_fsr.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_202_eb_fsr.mpsr
@@ -53,7 +53,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_205_eb_functional_architecture.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_205_eb_functional_architecture.mpsr
index 7317e8bb1..2bf7305c2 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_205_eb_functional_architecture.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_205_eb_functional_architecture.mpsr
@@ -86,7 +86,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -119,7 +119,7 @@
       </concept>
     </language>
     <language id="71797868-de95-425c-8470-36aa52c8ebc4" name="com.mbeddr.formal.base.arch">
-      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ng" index="3Ic8zf">
+      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ngI" index="3Ic8zf">
         <child id="9066112305507315710" name="contracts" index="3UnIb_" />
       </concept>
       <concept id="9066112305507423291" name="com.mbeddr.formal.base.arch.structure.Connection" flags="ng" index="3Ug1$w">
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_206_eb_implementation.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_206_eb_implementation.mpsr
index b30ad0841..e7bc38e43 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_206_eb_implementation.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_206_eb_implementation.mpsr
@@ -108,7 +108,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_302_eb_tsr.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_302_eb_tsr.mpsr
index 039d7be95..ee8431266 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_302_eb_tsr.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_302_eb_tsr.mpsr
@@ -47,7 +47,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_402_eb_safety_case.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_402_eb_safety_case.mpsr
index 254a78ebb..e2aa7fc6d 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_402_eb_safety_case.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break/_402_eb_safety_case.mpsr
@@ -34,7 +34,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/.model b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/.model
index 2ae0e9051..a488a5709 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/.model
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/.model
@@ -3,15 +3,12 @@
   <persistence version="9" />
   <attribute name="doNotGenerate" value="false" />
   <languages>
-    <use id="83ed2dfe-f724-46cc-852a-dce086daee3f" name="com.mbeddr.formal.base" version="0" />
-    <use id="001b2375-3bd5-4d5e-9958-6b3f62dc8548" name="com.mbeddr.formal.nusmv" version="0" />
-    <use id="e8a04d94-4307-4f88-95a2-25f7c4f39437" name="com.mbeddr.formal.safety.gsn" version="3" />
-    <use id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base" version="6" />
     <devkit ref="b0ef168f-6f92-4bd0-82f3-cf0521463683(fasten.requirements)" />
     <devkit ref="ac9a2847-3512-4af0-8db9-c20abbe2720a(fasten.safety)" />
     <devkit ref="5a50cadb-4d6e-4722-b5f5-c6b9efb22ffe(fasten.safety.gsn.formal)" />
     <devkit ref="3970a543-1808-4b9f-a378-71f15d96d819(fasten.safety.hara)" />
     <devkit ref="b64463ba-ae31-4cf7-be7b-afc13cab4daa(fasten.safety.gsn)" />
+    <devkit ref="5e597493-feae-41d8-b052-3b0a41743991(fasten.safety.gsn.patterns)" />
   </languages>
   <imports>
     <import index="6r4f" ref="r:975e4969-1ce0-4ded-8867-b40b46ebd140(_010_patterns_catalogue)" />
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_001_ihs_item_definition.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_001_ihs_item_definition.mpsr
index 73592fcab..5e4838ac8 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_001_ihs_item_definition.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_001_ihs_item_definition.mpsr
@@ -19,7 +19,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_002_ihs_operational_requirements.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_002_ihs_operational_requirements.mpsr
index 66701aedb..26be8018c 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_002_ihs_operational_requirements.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_002_ihs_operational_requirements.mpsr
@@ -35,7 +35,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_002_ihs_system_requirements.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_002_ihs_system_requirements.mpsr
index 2b221041b..5aa512691 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_002_ihs_system_requirements.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_002_ihs_system_requirements.mpsr
@@ -36,7 +36,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_003_ihs_functional_requirements.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_003_ihs_functional_requirements.mpsr
index 876dfbad4..657b1a4dc 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_003_ihs_functional_requirements.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_003_ihs_functional_requirements.mpsr
@@ -43,7 +43,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_004_ihs_technical_requirements.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_004_ihs_technical_requirements.mpsr
index af9a710ea..783a2f3b7 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_004_ihs_technical_requirements.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_004_ihs_technical_requirements.mpsr
@@ -42,7 +42,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_010_ihs_losses.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_010_ihs_losses.mpsr
index adb81d502..2483d17cc 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_010_ihs_losses.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_010_ihs_losses.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_011_ihs_operational_safety_concept.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_011_ihs_operational_safety_concept.mpsr
index 27d8ebf71..83168a1d8 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_011_ihs_operational_safety_concept.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_011_ihs_operational_safety_concept.mpsr
@@ -39,7 +39,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_012_operational_situations.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_012_operational_situations.mpsr
index b42e842b5..636c2180e 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_012_operational_situations.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_012_operational_situations.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_013_ihs_hazards_list.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_013_ihs_hazards_list.mpsr
index 8aad86896..4a58fabe8 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_013_ihs_hazards_list.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_013_ihs_hazards_list.mpsr
@@ -4,10 +4,10 @@
   <imports />
   <registry>
     <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">
+      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ngI" 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">
+      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ngI" 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">
@@ -22,7 +22,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_014_ihs_safety_goals.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_014_ihs_safety_goals.mpsr
index 68b753196..6646f9b28 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_014_ihs_safety_goals.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_014_ihs_safety_goals.mpsr
@@ -48,7 +48,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_020_ihs_functional_safety_requirements.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_020_ihs_functional_safety_requirements.mpsr
index 892698ad5..101eb0306 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_020_ihs_functional_safety_requirements.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_020_ihs_functional_safety_requirements.mpsr
@@ -48,7 +48,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_021_ihs_functional_safety_requirements_sensing.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_021_ihs_functional_safety_requirements_sensing.mpsr
index 315187636..dd860d4d9 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_021_ihs_functional_safety_requirements_sensing.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_021_ihs_functional_safety_requirements_sensing.mpsr
@@ -47,7 +47,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_022_ihs_system_architecture.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_022_ihs_system_architecture.mpsr
index e2a47d851..85511ab3c 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_022_ihs_system_architecture.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_022_ihs_system_architecture.mpsr
@@ -50,7 +50,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_023_ihs_sensors.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_023_ihs_sensors.mpsr
index 39235c057..4ecadf0b1 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_023_ihs_sensors.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_023_ihs_sensors.mpsr
@@ -41,7 +41,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_024_ihs_mission_channel.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_024_ihs_mission_channel.mpsr
index 671967d67..1a0bf4062 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_024_ihs_mission_channel.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_024_ihs_mission_channel.mpsr
@@ -57,7 +57,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_025_ihs_component.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_025_ihs_component.mpsr
index 123f64414..1ee4b2a01 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_025_ihs_component.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_025_ihs_component.mpsr
@@ -44,7 +44,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_661_ihs_technical_safety_requirements_lidar.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_661_ihs_technical_safety_requirements_lidar.mpsr
index 068b7548f..5c394c089 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_661_ihs_technical_safety_requirements_lidar.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_661_ihs_technical_safety_requirements_lidar.mpsr
@@ -44,7 +44,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_662_ihs_technical_safety_requirements_radar.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_662_ihs_technical_safety_requirements_radar.mpsr
index c8890bb11..eeef81552 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_662_ihs_technical_safety_requirements_radar.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_662_ihs_technical_safety_requirements_radar.mpsr
@@ -44,7 +44,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_663_ihs_technical_safety_requirements_camera.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_663_ihs_technical_safety_requirements_camera.mpsr
index 0e8976268..acfc2a328 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_663_ihs_technical_safety_requirements_camera.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_663_ihs_technical_safety_requirements_camera.mpsr
@@ -44,7 +44,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_670_ihs_high_level_safety_argumentation.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_670_ihs_high_level_safety_argumentation.mpsr
index 387a0d7c7..162bb0dbf 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_670_ihs_high_level_safety_argumentation.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_670_ihs_high_level_safety_argumentation.mpsr
@@ -28,7 +28,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_671_ihs_risk_based_argumentation.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_671_ihs_risk_based_argumentation.mpsr
index 363f80b1f..d259ea9e3 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_671_ihs_risk_based_argumentation.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs/_671_ihs_risk_based_argumentation.mpsr
@@ -39,7 +39,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._000_hara/_000_operational_situations.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._000_hara/_000_operational_situations.mpsr
index 272d7341c..5e22774cc 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._000_hara/_000_operational_situations.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._000_hara/_000_operational_situations.mpsr
@@ -12,7 +12,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._000_hara/_010_losses.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._000_hara/_010_losses.mpsr
index d42d6768f..3dba47884 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._000_hara/_010_losses.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._000_hara/_010_losses.mpsr
@@ -12,7 +12,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._000_hara/_020_hazards_list.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._000_hara/_020_hazards_list.mpsr
index 8a6bb0862..608a9ab06 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._000_hara/_020_hazards_list.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._000_hara/_020_hazards_list.mpsr
@@ -4,10 +4,10 @@
   <imports />
   <registry>
     <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">
+      <concept id="9102875167978228299" name="com.mbeddr.formal.safety.hara.structure.IHazardLike" flags="ngI" 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">
+      <concept id="9102875167978228288" name="com.mbeddr.formal.safety.hara.structure.IHazardsContainer" flags="ngI" 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">
@@ -19,7 +19,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._000_hara/_100_control_structure.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._000_hara/_100_control_structure.mpsr
index 95b49cbec..e809b228d 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._000_hara/_100_control_structure.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._000_hara/_100_control_structure.mpsr
@@ -23,7 +23,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._000_hara/_110_unsafe_control_actions.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._000_hara/_110_unsafe_control_actions.mpsr
index 08fe392e7..3f445c940 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._000_hara/_110_unsafe_control_actions.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._000_hara/_110_unsafe_control_actions.mpsr
@@ -43,7 +43,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._010_scenarios/_010_actors.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._010_scenarios/_010_actors.mpsr
index 5ceec88d8..6a7362730 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._010_scenarios/_010_actors.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._010_scenarios/_010_actors.mpsr
@@ -20,7 +20,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._010_scenarios/_020_contexts.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._010_scenarios/_020_contexts.mpsr
index 02bbe0cd5..1e1d0dc80 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._010_scenarios/_020_contexts.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._010_scenarios/_020_contexts.mpsr
@@ -20,7 +20,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._010_scenarios/_030_cem_urban_scenarios.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._010_scenarios/_030_cem_urban_scenarios.mpsr
index e225fbca9..f2b8fc7c9 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._010_scenarios/_030_cem_urban_scenarios.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._010_scenarios/_030_cem_urban_scenarios.mpsr
@@ -44,7 +44,7 @@
       <concept id="6156524541423588207" name="com.mbeddr.mpsutil.filepicker.structure.SolutionRelativeFilePicker" flags="ng" index="3NXOOs" />
     </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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_000_REQ_high_level.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_000_REQ_high_level.mpsr
index 4a583fbf3..99b0b0c14 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_000_REQ_high_level.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_000_REQ_high_level.mpsr
@@ -39,7 +39,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_010_FSR_activation.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_010_FSR_activation.mpsr
index ed7e77fc2..7b4a44154 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_010_FSR_activation.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_010_FSR_activation.mpsr
@@ -57,7 +57,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_010_FSR_activation_lower_level.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_010_FSR_activation_lower_level.mpsr
index 9be2b1b2b..0ddd400b3 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_010_FSR_activation_lower_level.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_010_FSR_activation_lower_level.mpsr
@@ -32,7 +32,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_010_FSR_deactivation.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_010_FSR_deactivation.mpsr
index 6a4f6768b..b30bc48cb 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_010_FSR_deactivation.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_010_FSR_deactivation.mpsr
@@ -51,7 +51,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_020_FSR_cem_collision.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_020_FSR_cem_collision.mpsr
index d1315d758..d310b215e 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_020_FSR_cem_collision.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_020_FSR_cem_collision.mpsr
@@ -47,7 +47,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_020_FSR_cem_collision_neighbouring_lane.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_020_FSR_cem_collision_neighbouring_lane.mpsr
index fe309d21c..8c9767386 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_020_FSR_cem_collision_neighbouring_lane.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_020_FSR_cem_collision_neighbouring_lane.mpsr
@@ -56,7 +56,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_020_FSR_cem_collision_neighbouring_lane_lower_level.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_020_FSR_cem_collision_neighbouring_lane_lower_level.mpsr
index 14c667127..e361dccca 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_020_FSR_cem_collision_neighbouring_lane_lower_level.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_020_FSR_cem_collision_neighbouring_lane_lower_level.mpsr
@@ -45,7 +45,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_020_FSR_cem_collision_same_lane.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_020_FSR_cem_collision_same_lane.mpsr
index 52bd310a5..71d5756c9 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_020_FSR_cem_collision_same_lane.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_020_FSR_cem_collision_same_lane.mpsr
@@ -53,7 +53,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_020_FSR_cem_collision_same_lane_lower_level.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_020_FSR_cem_collision_same_lane_lower_level.mpsr
index 0542365a8..5474aafcb 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_020_FSR_cem_collision_same_lane_lower_level.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_020_FSR_cem_collision_same_lane_lower_level.mpsr
@@ -44,7 +44,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_020_FSR_cem_driver_interaction.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_020_FSR_cem_driver_interaction.mpsr
index ec2b2f647..84fccba94 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_020_FSR_cem_driver_interaction.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_020_FSR_cem_driver_interaction.mpsr
@@ -36,7 +36,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_100_complementary_ads.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_100_complementary_ads.mpsr
index 953ab4106..7ce279522 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_100_complementary_ads.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements/_100_complementary_ads.mpsr
@@ -43,7 +43,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_000_avp_basic_data.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_000_avp_basic_data.mpsr
index 4d3be2285..b33540a4b 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_000_avp_basic_data.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_000_avp_basic_data.mpsr
@@ -33,7 +33,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_010_PERC_low_confidence.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_010_PERC_low_confidence.mpsr
index 428607ec5..9e8ea45fc 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_010_PERC_low_confidence.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_010_PERC_low_confidence.mpsr
@@ -40,7 +40,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_010_PLANNER_trajectory_priority.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_010_PLANNER_trajectory_priority.mpsr
index e61e8153e..030aa8804 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_010_PLANNER_trajectory_priority.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_010_PLANNER_trajectory_priority.mpsr
@@ -32,7 +32,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_010_TOP_LEVEL_dual_channel_safety.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_010_TOP_LEVEL_dual_channel_safety.mpsr
index 290fa3188..c7318194b 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_010_TOP_LEVEL_dual_channel_safety.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_010_TOP_LEVEL_dual_channel_safety.mpsr
@@ -40,7 +40,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_010_ads_sensors.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_010_ads_sensors.mpsr
index ecaca2ea7..2dbbc52ab 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_010_ads_sensors.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_010_ads_sensors.mpsr
@@ -22,7 +22,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_010_cem_activator.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_010_cem_activator.mpsr
index 3339f4657..644240550 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_010_cem_activator.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_010_cem_activator.mpsr
@@ -120,7 +120,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_011_backend_computer.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_011_backend_computer.mpsr
index 933dd01a2..7bf20e34d 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_011_backend_computer.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_011_backend_computer.mpsr
@@ -27,7 +27,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_020_cem_planner.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_020_cem_planner.mpsr
index e23202c1d..21db87927 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_020_cem_planner.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_020_cem_planner.mpsr
@@ -85,7 +85,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -127,7 +127,7 @@
       </concept>
     </language>
     <language id="71797868-de95-425c-8470-36aa52c8ebc4" name="com.mbeddr.formal.base.arch">
-      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ng" index="3Ic8zf">
+      <concept id="1258148499699359659" name="com.mbeddr.formal.base.arch.structure.IContractsContainer" flags="ngI" index="3Ic8zf">
         <child id="9066112305507315710" name="contracts" index="3UnIb_" />
       </concept>
       <concept id="9066112305507423291" name="com.mbeddr.formal.base.arch.structure.Connection" flags="ng" index="3Ug1$w">
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_020_cem_trajectory_computer.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_020_cem_trajectory_computer.mpsr
index b44af6cf4..8cb1a51bb 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_020_cem_trajectory_computer.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_020_cem_trajectory_computer.mpsr
@@ -37,7 +37,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_030_ads_planing.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_030_ads_planing.mpsr
index e9a8e1d97..7f9ffa6d3 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_030_ads_planing.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_030_ads_planing.mpsr
@@ -45,7 +45,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_040_collision_avoidance_monitor.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_040_collision_avoidance_monitor.mpsr
index e97d217ab..e9571ca1b 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_040_collision_avoidance_monitor.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_040_collision_avoidance_monitor.mpsr
@@ -23,7 +23,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_100_misison_channel.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_100_misison_channel.mpsr
index 4e9a153ac..dc519a41d 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_100_misison_channel.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_100_misison_channel.mpsr
@@ -23,7 +23,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_200_ads_top_level.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_200_ads_top_level.mpsr
index 5b8c51bac..0ca05508f 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_200_ads_top_level.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture/_200_ads_top_level.mpsr
@@ -58,7 +58,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._100_safety_case/_010_CEM_TOP.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._100_safety_case/_010_CEM_TOP.mpsr
index 74999e30a..7cb54626d 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._100_safety_case/_010_CEM_TOP.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._100_safety_case/_010_CEM_TOP.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._100_safety_case/_020_CEM_LEVEL3_01_TOP.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._100_safety_case/_020_CEM_LEVEL3_01_TOP.mpsr
index 08778461b..6874861e6 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._100_safety_case/_020_CEM_LEVEL3_01_TOP.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._100_safety_case/_020_CEM_LEVEL3_01_TOP.mpsr
@@ -31,7 +31,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._100_safety_case/_020_CEM_LEVEL3_02_COLLISION.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._100_safety_case/_020_CEM_LEVEL3_02_COLLISION.mpsr
index 1f05acf06..f5841532b 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._100_safety_case/_020_CEM_LEVEL3_02_COLLISION.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._100_safety_case/_020_CEM_LEVEL3_02_COLLISION.mpsr
@@ -28,7 +28,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._100_safety_case/_020_CEM_LEVEL3_03_COLLISION_NEIGH_LANE.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._100_safety_case/_020_CEM_LEVEL3_03_COLLISION_NEIGH_LANE.mpsr
index 76a738081..f05e4a12e 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._100_safety_case/_020_CEM_LEVEL3_03_COLLISION_NEIGH_LANE.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._100_safety_case/_020_CEM_LEVEL3_03_COLLISION_NEIGH_LANE.mpsr
@@ -25,7 +25,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/_010_uber_atg_safety_case_top.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/_010_uber_atg_safety_case_top.mpsr
index b420cd029..5c59e6502 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/_010_uber_atg_safety_case_top.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/_010_uber_atg_safety_case_top.mpsr
@@ -53,12 +53,16 @@
       </concept>
     </language>
     <language id="e8a04d94-4307-4f88-95a2-25f7c4f39437" name="com.mbeddr.formal.safety.gsn">
+      <concept id="3514655602814462718" name="com.mbeddr.formal.safety.gsn.structure.GoalStructureDoc" flags="ng" index="9kjDo">
+        <child id="3514655602814462801" name="documentation" index="9kjJR" />
+      </concept>
       <concept id="4266958635905406443" name="com.mbeddr.formal.safety.gsn.structure.Strategy" flags="ng" index="2vmxQI" />
       <concept id="4266958635905267565" name="com.mbeddr.formal.safety.gsn.structure.Goal" flags="ng" index="2vn7WC">
         <property id="5082481967878858900" name="away" index="2QdZbZ" />
         <reference id="5082481967878858987" name="goalDefinition" index="2QdZa0" />
       </concept>
       <concept id="4266958635905267510" name="com.mbeddr.formal.safety.gsn.structure.GoalStructure" flags="ng" index="2vn7XN">
+        <child id="3514655602814221387" name="documentation" index="9lmNH" />
         <child id="4266958635905772385" name="connections" index="2vhqc$" />
         <child id="4266958635905277632" name="content" index="2vn1q5" />
       </concept>
@@ -118051,6 +118055,13 @@
         </node>
       </node>
     </node>
+    <node concept="9kjDo" id="4yKSwbddGt_" role="9lmNH">
+      <node concept="19SGf9" id="4yKSwbddGtA" role="9kjJR">
+        <node concept="19SUe$" id="4yKSwbddGtB" role="19SJt6">
+          <property role="19SUeA" value="This is an import of the &#10;safety case published by &#10;Uber ATG. " />
+        </node>
+      </node>
+    </node>
   </node>
 </model>
 
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.1.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.1.mpsr
index 5176cd87f..3f329b1d2 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.1.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.1.mpsr
@@ -16,7 +16,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.2.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.2.mpsr
index 6f43c28a7..d9db6ead0 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.2.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.2.mpsr
@@ -16,7 +16,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.3.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.3.mpsr
index 767abbfa9..1d28b308b 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.3.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.3.mpsr
@@ -16,7 +16,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.4.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.4.mpsr
index 4348262fe..8c87420ed 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.4.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.4.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.5.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.5.mpsr
index 7429b3eac..2f61a46be 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.5.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.5.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.6.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.6.mpsr
index f5ceedc17..a9e80bdc8 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.6.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.6.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.7.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.7.mpsr
index 0989d2ed3..f7407e85f 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.7.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.7.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.8.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.8.mpsr
index 3108fad9e..a7238ea01 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.8.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.8.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.9.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.9.mpsr
index 7d06d9ab4..4894cdd5b 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.9.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.1.9.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.mpsr
index b04ab25d0..637087471 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.1.mpsr
@@ -16,7 +16,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.1.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.1.mpsr
index 9dc005cfd..8d0181b33 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.1.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.1.mpsr
@@ -16,7 +16,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.10.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.10.mpsr
index e23b2846b..5dfd7ab81 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.10.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.10.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.2.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.2.mpsr
index ba2218e33..621c1195c 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.2.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.2.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.3.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.3.mpsr
index cbacc2ad2..6b49d8740 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.3.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.3.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.4.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.4.mpsr
index 7d03fef50..5282ac9ae 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.4.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.4.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.5.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.5.mpsr
index 087676d20..e804c7d0d 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.5.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.5.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.6.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.6.mpsr
index 46094ee38..9d35a5a84 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.6.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.6.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.7.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.7.mpsr
index a093efe7c..0692fa3c8 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.7.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.7.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.8.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.8.mpsr
index b32e67b1b..2cdac92e6 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.8.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.8.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.9.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.9.mpsr
index 070108208..21b1a2019 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.9.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.1.9.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.2.1.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.2.1.mpsr
index 86f88e865..8e518218b 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.2.1.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.2.1.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.2.2.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.2.2.mpsr
index 7ec6ef3fc..e50d8995f 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.2.2.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.2.2.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.2.3.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.2.3.mpsr
index 9dea49ee6..03ceca153 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.2.3.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.2.3.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.2.4.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.2.4.mpsr
index 1d63c7183..47146325a 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.2.4.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.2.4.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.2.5.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.2.5.mpsr
index ca77f8f72..6eb603e87 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.2.5.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.2.5.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.2.6.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.2.6.mpsr
index b55a34fe9..99c3c35d8 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.2.6.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.2.6.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.2.7.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.2.7.mpsr
index 504277885..32e962282 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.2.7.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.2.7.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.mpsr
index c1e7fe593..ef2fc5169 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.2.mpsr
@@ -16,7 +16,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.1.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.1.mpsr
index dbf85a373..cbb4392e9 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.1.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.1.mpsr
@@ -16,7 +16,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.2.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.2.mpsr
index e2cc9a97c..f3f9c1304 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.2.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.2.mpsr
@@ -16,7 +16,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.3.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.3.mpsr
index a3a7c571f..3969daa53 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.3.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.3.mpsr
@@ -16,7 +16,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.1.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.1.mpsr
index e0634b091..7eff3f474 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.1.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.1.mpsr
@@ -16,7 +16,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.2.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.2.mpsr
index 1026d96fd..14f239f37 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.2.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.2.mpsr
@@ -16,7 +16,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.3.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.3.mpsr
index 151eed999..c4a986501 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.3.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.3.mpsr
@@ -16,7 +16,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.4.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.4.mpsr
index b3ff31904..5648b16a8 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.4.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.4.mpsr
@@ -16,7 +16,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.5.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.5.mpsr
index 5a14aa534..365398d1b 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.5.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.5.mpsr
@@ -16,7 +16,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.6.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.6.mpsr
index 771335704..1755a1a70 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.6.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.6.mpsr
@@ -16,7 +16,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.7.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.7.mpsr
index 7341b1f5d..6d391a7d1 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.7.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.7.mpsr
@@ -16,7 +16,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.8.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.8.mpsr
index ff6055c4c..0f6b9ee13 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.8.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.8.mpsr
@@ -16,7 +16,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.9.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.9.mpsr
index 7fb9ab637..664c5d1a9 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.9.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.4.1.9.mpsr
@@ -16,7 +16,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.5.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.5.mpsr
index 60c1d27c6..35e912c8b 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.5.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.5.mpsr
@@ -16,7 +16,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.6.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.6.mpsr
index 64cdfaa0a..ebf036209 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.6.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.1.6.mpsr
@@ -16,7 +16,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.mpsr
index 64301ab7e..a5acb793e 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.3.mpsr
@@ -16,7 +16,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.1.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.1.mpsr
index e9327e18f..de839a5d2 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.1.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.1.mpsr
@@ -16,7 +16,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.4.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.4.mpsr
index 1ae7f40ad..830d5602a 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.4.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.4.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.9.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.9.mpsr
index df4b99b2f..cc7a5df9a 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.9.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.9.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.mpsr
index 6300de152..52df974a8 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.mpsr
@@ -16,7 +16,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.2.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.2.mpsr
index 6e5b96608..640a80fd7 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.2.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.2.mpsr
@@ -16,7 +16,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.3.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.3.mpsr
index 89f6db18c..e9f54e8dc 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.3.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.3.mpsr
@@ -16,7 +16,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.mpsr
index bbe676b86..b5adecef6 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.mpsr
@@ -16,7 +16,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.5.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.5.mpsr
index c51f2889b..20d1d14d0 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.5.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.5.mpsr
@@ -16,7 +16,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.1.1.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.1.1.mpsr
index 2cb68e74d..644739b2e 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.1.1.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.1.1.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.1.2.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.1.2.mpsr
index b7cf3da6d..b89c4f67e 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.1.2.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.1.2.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.1.3.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.1.3.mpsr
index 42f7bbf94..855765e2b 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.1.3.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.1.3.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.1.4.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.1.4.mpsr
index 820cdda7b..4fe12dc12 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.1.4.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.1.4.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.1.5.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.1.5.mpsr
index 7fee4c5f5..854b7080b 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.1.5.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.1.5.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.1.6.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.1.6.mpsr
index d65da9ee3..9e798f765 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.1.6.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.1.6.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.1.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.1.mpsr
index 945c2eac4..13dfa600c 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.1.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.1.mpsr
@@ -16,7 +16,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.2.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.2.mpsr
index a1e0a82f8..f64d0bf85 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.2.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.2.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.3.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.3.mpsr
index afcd0a654..517ab86a0 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.3.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G2.1.3.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G3.1.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G3.1.mpsr
index a1e2d4644..37bab0834 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G3.1.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G3.1.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G3.2.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G3.2.mpsr
index f171f23b0..03a4b2255 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G3.2.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G3.2.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G3.3.1.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G3.3.1.mpsr
index 876417073..6f461432a 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G3.3.1.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G3.3.1.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G3.3.2.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G3.3.2.mpsr
index e8992d703..bdb34a665 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G3.3.2.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G3.3.2.mpsr
@@ -16,7 +16,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G3.4.1.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G3.4.1.mpsr
index 726e429ab..3cfd7d5ce 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G3.4.1.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G3.4.1.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G3.4.2.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G3.4.2.mpsr
index 76da9f0d2..30a13848a 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G3.4.2.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G3.4.2.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G4.1.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G4.1.mpsr
index 86f07bf32..a3164afe8 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G4.1.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G4.1.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G4.2.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G4.2.mpsr
index 1ee240152..42b0a8cc3 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G4.2.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G4.2.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G4.3.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G4.3.mpsr
index d427f2782..2b3d3e34c 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G4.3.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G4.3.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G5.1.1.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G5.1.1.mpsr
index f7c17377c..7b355aca9 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G5.1.1.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G5.1.1.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G5.1.2.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G5.1.2.mpsr
index 1c05a643b..d0742a5e4 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G5.1.2.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G5.1.2.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G5.1.3.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G5.1.3.mpsr
index d6285a496..1a09227a1 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G5.1.3.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G5.1.3.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G5.1.4.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G5.1.4.mpsr
index 5bd9dfc72..be07ddb3a 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G5.1.4.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G5.1.4.mpsr
@@ -15,7 +15,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/pdf_export_demo.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/pdf_export_demo.mpsr
index befb55ac5..9e5834768 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/pdf_export_demo.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/pdf_export_demo.mpsr
@@ -19,7 +19,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized_pdf_export.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized_pdf_export.mps
index 1ccbe1a30..61cb8edbb 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized_pdf_export.mps
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized_pdf_export.mps
@@ -24,7 +24,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized_visualization.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized_visualization.mps
index 2beaefc29..34877dea4 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized_visualization.mps
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized_visualization.mps
@@ -23,7 +23,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc/FASTEN_Safety_Tutorial_Documentation.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc/FASTEN_Safety_Tutorial_Documentation.mpsr
index 43e049c7e..92db686e5 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc/FASTEN_Safety_Tutorial_Documentation.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc/FASTEN_Safety_Tutorial_Documentation.mpsr
@@ -19,7 +19,7 @@
       <concept id="6165313375055797476" name="com.mbeddr.doc.structure.FormattedText" flags="ng" index="$DsGX">
         <child id="6165313375055797477" name="text" index="$DsGW" />
       </concept>
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
         <child id="8730648445433290694" name="dependsOn" index="1DXQ57" />
       </concept>
@@ -32,7 +32,7 @@
       <concept id="3350625596580089586" name="com.mbeddr.doc.structure.TextParagraph" flags="ng" index="1_0LV8">
         <child id="3350625596580089613" name="text" index="1_0LWR" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
       <concept id="3350625596580064222" name="com.mbeddr.doc.structure.AbstractSection" flags="ng" index="1_0VJ$">
@@ -55,7 +55,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc/_010_requirements_modeling.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc/_010_requirements_modeling.mpsr
index 821aad5fb..3abf5bb10 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc/_010_requirements_modeling.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc/_010_requirements_modeling.mpsr
@@ -15,7 +15,7 @@
     </language>
     <language id="2374bc90-7e37-41f1-a9c4-c2e35194c36a" name="com.mbeddr.doc">
       <concept id="4317007310193476045" name="com.mbeddr.doc.structure.ScaleDownNotUp100" flags="ng" index="2bctqb" />
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
       </concept>
       <concept id="2286331641395252232" name="com.mbeddr.doc.structure.NamedNodeModelContentPointerElement" flags="ng" index="2NCMab">
@@ -47,7 +47,7 @@
       <concept id="3350625596580089586" name="com.mbeddr.doc.structure.TextParagraph" flags="ng" index="1_0LV8">
         <child id="3350625596580089613" name="text" index="1_0LWR" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
       <concept id="3350625596580064222" name="com.mbeddr.doc.structure.AbstractSection" flags="ng" index="1_0VJ$">
@@ -67,7 +67,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc/_020_hazards_and_risks_analysis.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc/_020_hazards_and_risks_analysis.mpsr
index b68eb2009..b51efe1ce 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc/_020_hazards_and_risks_analysis.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc/_020_hazards_and_risks_analysis.mpsr
@@ -19,7 +19,7 @@
       <concept id="6165313375055797476" name="com.mbeddr.doc.structure.FormattedText" flags="ng" index="$DsGX">
         <child id="6165313375055797477" name="text" index="$DsGW" />
       </concept>
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
       </concept>
       <concept id="2286331641395252232" name="com.mbeddr.doc.structure.NamedNodeModelContentPointerElement" flags="ng" index="2NCMab">
@@ -55,7 +55,7 @@
       <concept id="3350625596580089586" name="com.mbeddr.doc.structure.TextParagraph" flags="ng" index="1_0LV8">
         <child id="3350625596580089613" name="text" index="1_0LWR" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
       <concept id="3350625596580064222" name="com.mbeddr.doc.structure.AbstractSection" flags="ng" index="1_0VJ$">
@@ -76,7 +76,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc/_030_safety_engineering_models.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc/_030_safety_engineering_models.mpsr
index 15f976fb0..5ec446378 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc/_030_safety_engineering_models.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc/_030_safety_engineering_models.mpsr
@@ -19,7 +19,7 @@
       <concept id="6165313375055797476" name="com.mbeddr.doc.structure.FormattedText" flags="ng" index="$DsGX">
         <child id="6165313375055797477" name="text" index="$DsGW" />
       </concept>
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
       </concept>
       <concept id="2286331641395252232" name="com.mbeddr.doc.structure.NamedNodeModelContentPointerElement" flags="ng" index="2NCMab">
@@ -40,7 +40,7 @@
       <concept id="3350625596580089586" name="com.mbeddr.doc.structure.TextParagraph" flags="ng" index="1_0LV8">
         <child id="3350625596580089613" name="text" index="1_0LWR" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
       <concept id="3350625596580064222" name="com.mbeddr.doc.structure.AbstractSection" flags="ng" index="1_0VJ$">
@@ -60,7 +60,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc/_050_assurance_models.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc/_050_assurance_models.mpsr
index aebe67a6c..185658e61 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc/_050_assurance_models.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc/_050_assurance_models.mpsr
@@ -23,7 +23,7 @@
       <concept id="6165313375055797476" name="com.mbeddr.doc.structure.FormattedText" flags="ng" index="$DsGX">
         <child id="6165313375055797477" name="text" index="$DsGW" />
       </concept>
-      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ng" index="G9hjZ">
+      <concept id="6657644269295214799" name="com.mbeddr.doc.structure.IDocumentLike" flags="ngI" index="G9hjZ">
         <reference id="6657644269295214800" name="config" index="G9hjw" />
       </concept>
       <concept id="2286331641395252232" name="com.mbeddr.doc.structure.NamedNodeModelContentPointerElement" flags="ng" index="2NCMab">
@@ -44,7 +44,7 @@
       <concept id="3350625596580089586" name="com.mbeddr.doc.structure.TextParagraph" flags="ng" index="1_0LV8">
         <child id="3350625596580089613" name="text" index="1_0LWR" />
       </concept>
-      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
+      <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ngI" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
       </concept>
       <concept id="3350625596580064222" name="com.mbeddr.doc.structure.AbstractSection" flags="ng" index="1_0VJ$">
@@ -65,7 +65,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc/conf.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc/conf.mpsr
index 20bf2c081..c44db0a46 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc/conf.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc/conf.mpsr
@@ -28,7 +28,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc/export.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc/export.mpsr
index ff853e07b..95011fa16 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc/export.mpsr
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc/export.mpsr
@@ -29,7 +29,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
diff --git a/gradle.lockfile b/gradle.lockfile
index cb8ab0ad7..d92cec6d1 100644
--- a/gradle.lockfile
+++ b/gradle.lockfile
@@ -9,7 +9,7 @@ com.fasterxml.jackson:jackson-bom:2.13.5=modelcheckBackend
 com.fasterxml.woodstox:woodstox-core:6.4.0=modelcheckBackend
 com.jetbrains.jdk:jbr_jcef:17.0.8.1-b1000.32=jbrLinux,jbrMac,jbrWin
 com.jetbrains:mps:2023.2.1=mps
-com.mbeddr:platform:2023.2.24804.386ed54=languageLibs
+com.mbeddr:platform:2023.2.24894.c2330ba=languageLibs
 com.xenomachina:kotlin-argparser:2.0.7=executeBackend,generateBackend,modelcheckBackend,remigrateBackend
 com.xenomachina:xenocom:0.0.7=executeBackend,generateBackend,modelcheckBackend,remigrateBackend
 de.itemis.mps.build-backends:execute-generators:1.15.1.98.8f853d3=generateBackend
@@ -29,5 +29,5 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21=executeBackend,generateBackend,mo
 org.jetbrains.kotlin:kotlin-stdlib:1.6.21=executeBackend,generateBackend,modelcheckBackend,remigrateBackend
 org.jetbrains.kotlin:kotlin-test:1.6.21=modelcheckBackend
 org.jetbrains:annotations:13.0=executeBackend,generateBackend,modelcheckBackend,remigrateBackend
-org.mpsqa:all-in-one:2023.2.657.4e8f442=languageLibs
+org.mpsqa:all-in-one:2023.2.752.8c191d0=languageLibs
 empty=