diff --git a/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/com.fasten.symo.hw.mpl b/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/com.fasten.symo.hw.mpl
index bf1e13ce3..a029f0ed5 100644
--- a/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/com.fasten.symo.hw.mpl
+++ b/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/com.fasten.symo.hw.mpl
@@ -17,7 +17,7 @@
     <dependency reexport="true">1144260c-e9a5-49a2-9add-39a1a1a7077e(de.itemis.mps.editor.diagram.runtime)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="0" />
+    <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.fasten.symo/languages/com.fasten.symo.hw/models/com.fasten.symo.hw.editor.mps b/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/models/com.fasten.symo.hw.editor.mps
index b516a4c4a..dafa4b436 100644
--- a/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/models/com.fasten.symo.hw.editor.mps
+++ b/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/models/com.fasten.symo.hw.editor.mps
@@ -3,7 +3,7 @@
   <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="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.fasten.symo/languages/com.symo.sysml.ibd/com.symo.sysml.ibd.mpl b/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/com.symo.sysml.ibd.mpl
index 0c31a7c13..46f40d30d 100644
--- a/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/com.symo.sysml.ibd.mpl
+++ b/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/com.symo.sysml.ibd.mpl
@@ -22,7 +22,7 @@
   <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:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" 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.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.editor.mps b/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.editor.mps
index 4e663cff2..e175f0aec 100644
--- a/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.editor.mps
+++ b/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.editor.mps
@@ -5,7 +5,7 @@
   <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" />
-    <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" 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.fasten.symo/solutions/com.fasten.symo.hw.sandbox/models/com.fasten.symo.hw.sandbox._010_simple_hw_architecture.mps b/code/languages/com.fasten.symo/solutions/com.fasten.symo.hw.sandbox/models/com.fasten.symo.hw.sandbox._010_simple_hw_architecture.mps
index bb96c00cb..ba5c068d9 100644
--- a/code/languages/com.fasten.symo/solutions/com.fasten.symo.hw.sandbox/models/com.fasten.symo.hw.sandbox._010_simple_hw_architecture.mps
+++ b/code/languages/com.fasten.symo/solutions/com.fasten.symo.hw.sandbox/models/com.fasten.symo.hw.sandbox._010_simple_hw_architecture.mps
@@ -89,12 +89,12 @@
       <property role="TrG5h" value="ecu2" />
     </node>
     <node concept="2jnq7J" id="2gpUZARhwa8" role="2jnmDS">
-      <ref role="2jnmXU" node="2gpUZARh4BO" />
-      <ref role="2jnmXW" node="2gpUZARh4BT" />
+      <ref role="2jnmXU" node="2gpUZARh4BO" resolve="ecu1" />
+      <ref role="2jnmXW" node="2gpUZARh4BT" resolve="bus" />
     </node>
     <node concept="2jnq7J" id="2gpUZARhwaa" role="2jnmDS">
-      <ref role="2jnmXU" node="2gpUZARh4C9" />
-      <ref role="2jnmXW" node="2gpUZARh4BT" />
+      <ref role="2jnmXU" node="2gpUZARh4C9" resolve="ecu2" />
+      <ref role="2jnmXW" node="2gpUZARh4BT" resolve="bus" />
     </node>
   </node>
 </model>
diff --git a/code/languages/com.fasten.symo/solutions/com.symo.sysml.ibd.sandbox/models/com.symo.sysml.ibd.sandbox._010_smoke.mps b/code/languages/com.fasten.symo/solutions/com.symo.sysml.ibd.sandbox/models/com.symo.sysml.ibd.sandbox._010_smoke.mps
index 8f908b0cc..b4994c205 100644
--- a/code/languages/com.fasten.symo/solutions/com.symo.sysml.ibd.sandbox/models/com.symo.sysml.ibd.sandbox._010_smoke.mps
+++ b/code/languages/com.fasten.symo/solutions/com.symo.sysml.ibd.sandbox/models/com.symo.sysml.ibd.sandbox._010_smoke.mps
@@ -76,7 +76,7 @@
       <property role="TrG5h" value="Sender" />
       <node concept="3USqFc" id="pk5lVrZWqi" role="3UVs02">
         <property role="TrG5h" value="data" />
-        <ref role="3US7yy" node="pk5lVrZWqd" />
+        <ref role="3US7yy" node="pk5lVrZWqd" resolve="Data" />
       </node>
     </node>
     <node concept="3UUxL_" id="pk5lVrZWqq" role="3UUxLy" />
@@ -84,7 +84,7 @@
       <property role="TrG5h" value="Receiver" />
       <node concept="3USqFc" id="pk5lVrZWqL" role="3UVs00">
         <property role="TrG5h" value="data" />
-        <ref role="3US7yy" node="pk5lVrZWqd" />
+        <ref role="3US7yy" node="pk5lVrZWqd" resolve="Data" />
       </node>
     </node>
     <node concept="3UUxL_" id="pk5lVrZWr9" role="3UUxLy" />
@@ -93,20 +93,20 @@
       <node concept="3UVpuM" id="pk5lVrZWrH" role="3UVWDc">
         <node concept="3UVpuK" id="pk5lVrZWrJ" role="3UVKbZ">
           <property role="TrG5h" value="s" />
-          <ref role="3UVpu6" node="6TLpWSY0gIt" />
+          <ref role="3UVpu6" node="6TLpWSY0gIt" resolve="Sender" />
         </node>
         <node concept="3UVpuK" id="pk5lVrZWrO" role="3UVKbZ">
           <property role="TrG5h" value="r" />
-          <ref role="3UVpu6" node="pk5lVrZWqB" />
+          <ref role="3UVpu6" node="pk5lVrZWqB" resolve="Receiver" />
         </node>
         <node concept="3UVptf" id="pk5lVrZWrW" role="3UVKbZ">
           <node concept="3UVgTP" id="pk5lVrZWs1" role="3UVptc">
-            <ref role="3UVgTb" node="pk5lVrZWrJ" />
-            <ref role="3UVgT4" node="pk5lVrZWqi" />
+            <ref role="3UVgTb" node="pk5lVrZWrJ" resolve="s" />
+            <ref role="3UVgT4" node="pk5lVrZWqi" resolve="data" />
           </node>
           <node concept="3UVgTP" id="pk5lVrZWs3" role="3UVpta">
-            <ref role="3UVgTb" node="pk5lVrZWrO" />
-            <ref role="3UVgT4" node="pk5lVrZWqL" />
+            <ref role="3UVgTb" node="pk5lVrZWrO" resolve="r" />
+            <ref role="3UVgT4" node="pk5lVrZWqL" resolve="data" />
           </node>
         </node>
         <node concept="37mRI7" id="pk5lVrZWs6" role="lGtFl">
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/com.fasten.base.activity.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/com.fasten.base.activity.mpl
index 88ce2e9b1..d35f8f344 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/com.fasten.base.activity.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/com.fasten.base.activity.mpl
@@ -87,7 +87,7 @@
     <dependency reexport="false">b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" 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.nusmv/languages/com.fasten.base.activity/models/com.fasten.base.activity.editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/models/com.fasten.base.activity.editor.mps
index 99c123092..fb51be1ab 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/models/com.fasten.base.activity.editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/models/com.fasten.base.activity.editor.mps
@@ -3,7 +3,7 @@
   <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="0" />
+    <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="1" />
     <use id="515552c7-fcc0-4ab4-9789-2f3c49344e85" name="jetbrains.mps.baseLanguage.varVariable" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/com.mbeddr.formal.base.arch.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/com.mbeddr.formal.base.arch.mpl
index 9bbf1a74e..9f23d601e 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/com.mbeddr.formal.base.arch.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/com.mbeddr.formal.base.arch.mpl
@@ -27,7 +27,7 @@
     <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:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="0" />
+    <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="1" />
     <language slang="l:a0ab8c10-c118-4755-ba27-3853435cf524:de.itemis.mps.tooltips" 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" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/editor.mps
index a5a1e7bf2..00761f9cb 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/editor.mps
@@ -5,7 +5,7 @@
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
     <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="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="0" />
+    <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="1" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="1919c723-b60b-4592-9318-9ce96d91da44" name="de.itemis.mps.editor.celllayout" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/com.mbeddr.formal.base.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/com.mbeddr.formal.base.mpl
index a26f86e28..96b6d5898 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/com.mbeddr.formal.base.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/com.mbeddr.formal.base.mpl
@@ -34,7 +34,7 @@
     <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:1919c723-b60b-4592-9318-9ce96d91da44:de.itemis.mps.editor.celllayout" version="0" />
-    <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" 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.nusmv/languages/com.mbeddr.formal.base/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/editor.mps
index 89230f63e..9f6ae27a7 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/editor.mps
@@ -7,7 +7,7 @@
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
     <use id="1919c723-b60b-4592-9318-9ce96d91da44" name="de.itemis.mps.editor.celllayout" version="0" />
-    <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="0" />
+    <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="1" />
     <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" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/com.mbeddr.formal.nusmv.arch.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/com.mbeddr.formal.nusmv.arch.mpl
index 375a97f78..d8955ed07 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/com.mbeddr.formal.nusmv.arch.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/com.mbeddr.formal.nusmv.arch.mpl
@@ -90,7 +90,7 @@
     <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:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="0" />
+    <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="1" />
     <language slang="l:21063c66-85ba-4e98-839b-036445b17ae2:de.itemis.mps.editor.layout" 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" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/editor.mps
index ce55d9a30..5fd705b1e 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/editor.mps
@@ -3,7 +3,7 @@
   <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="0" />
+    <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="1" />
     <use id="1919c723-b60b-4592-9318-9ce96d91da44" name="de.itemis.mps.editor.celllayout" version="0" />
     <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" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/com.mbeddr.formal.nusmv.cbd.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/com.mbeddr.formal.nusmv.cbd.mpl
index 6456d24b6..15cd0c544 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/com.mbeddr.formal.nusmv.cbd.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/com.mbeddr.formal.nusmv.cbd.mpl
@@ -119,7 +119,7 @@
     <language slang="l:b4f35ed8-45af-4efa-abe4-00ac26956e69:com.mbeddr.mpsutil.grammarcells.runtimelang" 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:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" 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.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/editor.mps
index d74f77836..36bdc8309 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/editor.mps
@@ -9,7 +9,7 @@
     <use id="b4f35ed8-45af-4efa-abe4-00ac26956e69" name="com.mbeddr.mpsutil.grammarcells.runtimelang" version="0" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
-    <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="0" />
+    <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="1" />
     <use id="1919c723-b60b-4592-9318-9ce96d91da44" name="de.itemis.mps.editor.celllayout" version="0" />
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
     <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/com.mbeddr.formal.nusmv.sm.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/com.mbeddr.formal.nusmv.sm.mpl
index 81a8fd522..0d49bd8b2 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/com.mbeddr.formal.nusmv.sm.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/com.mbeddr.formal.nusmv.sm.mpl
@@ -82,7 +82,7 @@
     <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:1919c723-b60b-4592-9318-9ce96d91da44:de.itemis.mps.editor.celllayout" version="0" />
-    <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="0" />
+    <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="1" />
     <language slang="l:21063c66-85ba-4e98-839b-036445b17ae2:de.itemis.mps.editor.layout" 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" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/editor.mps
index a6c314e97..70b85f2d4 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/editor.mps
@@ -3,7 +3,7 @@
   <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="0" />
+    <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="1" />
     <use id="1919c723-b60b-4592-9318-9ce96d91da44" name="de.itemis.mps.editor.celllayout" version="0" />
     <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" />
diff --git a/code/languages/com.mbeddr.formal.prism/tests/test.com.mbeddr.formal.prism/models/test.com.mbeddr.formal.prism._010_smoke.mps b/code/languages/com.mbeddr.formal.prism/tests/test.com.mbeddr.formal.prism/models/test.com.mbeddr.formal.prism._010_smoke.mps
index b27723d94..c17f9a295 100644
--- a/code/languages/com.mbeddr.formal.prism/tests/test.com.mbeddr.formal.prism/models/test.com.mbeddr.formal.prism._010_smoke.mps
+++ b/code/languages/com.mbeddr.formal.prism/tests/test.com.mbeddr.formal.prism/models/test.com.mbeddr.formal.prism._010_smoke.mps
@@ -155,7 +155,7 @@
         <node concept="112hEE" id="ZaBFheNc6A" role="112hEJ">
           <node concept="113wzp" id="ZaBFheNc6B" role="113wzu">
             <node concept="112hFX" id="ZaBFheNc72" role="113wzq">
-              <ref role="112hCK" node="ZaBFheM00U" />
+              <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
             </node>
             <node concept="2IPVmt" id="ZaBFheNc78" role="113wz4">
               <property role="2IPVms" value="1" />
@@ -168,7 +168,7 @@
         <node concept="112hEE" id="1rXrB7iRZXF" role="112hEJ">
           <node concept="113wzp" id="1rXrB7iRZXG" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShfw" role="113wzq">
-              <ref role="112hCK" node="ZaBFheM00U" />
+              <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShfA" role="113wz4">
               <property role="2IPVms" value="2" />
@@ -183,7 +183,7 @@
             <property role="2IPVms" value="0" />
           </node>
           <node concept="112hFX" id="ZaBFheNc7c" role="2H9Iav">
-            <ref role="112hCK" node="ZaBFheM00U" />
+            <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
           </node>
         </node>
       </node>
@@ -191,7 +191,7 @@
         <node concept="112hEE" id="1rXrB7iShgJ" role="112hEJ">
           <node concept="113wzp" id="1rXrB7iShgK" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShgL" role="113wzq">
-              <ref role="112hCK" node="ZaBFheM00U" />
+              <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShgM" role="113wz4">
               <property role="2IPVms" value="3" />
@@ -204,7 +204,7 @@
         <node concept="112hEE" id="1rXrB7iShgO" role="112hEJ">
           <node concept="113wzp" id="1rXrB7iShgP" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShgQ" role="113wzq">
-              <ref role="112hCK" node="ZaBFheM00U" />
+              <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShgR" role="113wz4">
               <property role="2IPVms" value="4" />
@@ -219,7 +219,7 @@
             <property role="2IPVms" value="1" />
           </node>
           <node concept="112hFX" id="1rXrB7iShgV" role="2H9Iav">
-            <ref role="112hCK" node="ZaBFheM00U" />
+            <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
           </node>
         </node>
       </node>
@@ -227,7 +227,7 @@
         <node concept="112hEE" id="1rXrB7iShhS" role="112hEJ">
           <node concept="113wzp" id="1rXrB7iShhT" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShhU" role="113wzq">
-              <ref role="112hCK" node="ZaBFheM00U" />
+              <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShhV" role="113wz4">
               <property role="2IPVms" value="5" />
@@ -240,7 +240,7 @@
         <node concept="112hEE" id="1rXrB7iShhX" role="112hEJ">
           <node concept="113wzp" id="1rXrB7iShhY" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShhZ" role="113wzq">
-              <ref role="112hCK" node="ZaBFheM00U" />
+              <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShi0" role="113wz4">
               <property role="2IPVms" value="6" />
@@ -255,7 +255,7 @@
             <property role="2IPVms" value="2" />
           </node>
           <node concept="112hFX" id="1rXrB7iShi4" role="2H9Iav">
-            <ref role="112hCK" node="ZaBFheM00U" />
+            <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
           </node>
         </node>
       </node>
@@ -263,7 +263,7 @@
         <node concept="112hEE" id="1rXrB7iShj3" role="112hEJ">
           <node concept="113wzp" id="1rXrB7iShj4" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShj5" role="113wzq">
-              <ref role="112hCK" node="ZaBFheM00U" />
+              <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShj6" role="113wz4">
               <property role="2IPVms" value="1" />
@@ -276,7 +276,7 @@
         <node concept="112hEE" id="1rXrB7iShj8" role="112hEJ">
           <node concept="113wzp" id="1rXrB7iShj9" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShja" role="113wzq">
-              <ref role="112hCK" node="ZaBFheM00U" />
+              <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShjb" role="113wz4">
               <property role="2IPVms" value="7" />
@@ -284,7 +284,7 @@
           </node>
           <node concept="113wzp" id="1rXrB7iShkr" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShk$" role="113wzq">
-              <ref role="112hCK" node="ZaBFheMfar" />
+              <ref role="112hCK" node="ZaBFheMfar" resolve="d" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShkF" role="113wz4">
               <property role="2IPVms" value="1" />
@@ -299,7 +299,7 @@
             <property role="2IPVms" value="3" />
           </node>
           <node concept="112hFX" id="1rXrB7iShjf" role="2H9Iav">
-            <ref role="112hCK" node="ZaBFheM00U" />
+            <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
           </node>
         </node>
       </node>
@@ -307,7 +307,7 @@
         <node concept="112hEE" id="1rXrB7iShkI" role="112hEJ">
           <node concept="113wzp" id="1rXrB7iShkJ" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShkK" role="113wzq">
-              <ref role="112hCK" node="ZaBFheM00U" />
+              <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShkL" role="113wz4">
               <property role="2IPVms" value="7" />
@@ -315,7 +315,7 @@
           </node>
           <node concept="113wzp" id="1rXrB7iShmt" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShmA" role="113wzq">
-              <ref role="112hCK" node="ZaBFheMfar" />
+              <ref role="112hCK" node="ZaBFheMfar" resolve="d" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShmH" role="113wz4">
               <property role="2IPVms" value="2" />
@@ -328,7 +328,7 @@
         <node concept="112hEE" id="1rXrB7iShkN" role="112hEJ">
           <node concept="113wzp" id="1rXrB7iShkO" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShkP" role="113wzq">
-              <ref role="112hCK" node="ZaBFheM00U" />
+              <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShkQ" role="113wz4">
               <property role="2IPVms" value="7" />
@@ -336,7 +336,7 @@
           </node>
           <node concept="113wzp" id="1rXrB7iShkR" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShkS" role="113wzq">
-              <ref role="112hCK" node="ZaBFheMfar" />
+              <ref role="112hCK" node="ZaBFheMfar" resolve="d" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShkT" role="113wz4">
               <property role="2IPVms" value="3" />
@@ -351,7 +351,7 @@
             <property role="2IPVms" value="4" />
           </node>
           <node concept="112hFX" id="1rXrB7iShkX" role="2H9Iav">
-            <ref role="112hCK" node="ZaBFheM00U" />
+            <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
           </node>
         </node>
       </node>
@@ -359,7 +359,7 @@
         <node concept="112hEE" id="1rXrB7iShnk" role="112hEJ">
           <node concept="113wzp" id="1rXrB7iShnl" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShnm" role="113wzq">
-              <ref role="112hCK" node="ZaBFheM00U" />
+              <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShnn" role="113wz4">
               <property role="2IPVms" value="7" />
@@ -367,7 +367,7 @@
           </node>
           <node concept="113wzp" id="1rXrB7iShno" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShnp" role="113wzq">
-              <ref role="112hCK" node="ZaBFheMfar" />
+              <ref role="112hCK" node="ZaBFheMfar" resolve="d" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShnq" role="113wz4">
               <property role="2IPVms" value="4" />
@@ -380,7 +380,7 @@
         <node concept="112hEE" id="1rXrB7iShns" role="112hEJ">
           <node concept="113wzp" id="1rXrB7iShnt" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShnu" role="113wzq">
-              <ref role="112hCK" node="ZaBFheM00U" />
+              <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShnv" role="113wz4">
               <property role="2IPVms" value="7" />
@@ -388,7 +388,7 @@
           </node>
           <node concept="113wzp" id="1rXrB7iShnw" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShnx" role="113wzq">
-              <ref role="112hCK" node="ZaBFheMfar" />
+              <ref role="112hCK" node="ZaBFheMfar" resolve="d" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShny" role="113wz4">
               <property role="2IPVms" value="5" />
@@ -403,7 +403,7 @@
             <property role="2IPVms" value="5" />
           </node>
           <node concept="112hFX" id="1rXrB7iShnA" role="2H9Iav">
-            <ref role="112hCK" node="ZaBFheM00U" />
+            <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
           </node>
         </node>
       </node>
@@ -411,7 +411,7 @@
         <node concept="112hEE" id="1rXrB7iShpu" role="112hEJ">
           <node concept="113wzp" id="1rXrB7iShpv" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShpw" role="113wzq">
-              <ref role="112hCK" node="ZaBFheM00U" />
+              <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShpx" role="113wz4">
               <property role="2IPVms" value="2" />
@@ -424,7 +424,7 @@
         <node concept="112hEE" id="1rXrB7iShpA" role="112hEJ">
           <node concept="113wzp" id="1rXrB7iShpB" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShpC" role="113wzq">
-              <ref role="112hCK" node="ZaBFheM00U" />
+              <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShpD" role="113wz4">
               <property role="2IPVms" value="7" />
@@ -432,7 +432,7 @@
           </node>
           <node concept="113wzp" id="1rXrB7iShpE" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShpF" role="113wzq">
-              <ref role="112hCK" node="ZaBFheMfar" />
+              <ref role="112hCK" node="ZaBFheMfar" resolve="d" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShpG" role="113wz4">
               <property role="2IPVms" value="6" />
@@ -447,7 +447,7 @@
             <property role="2IPVms" value="6" />
           </node>
           <node concept="112hFX" id="1rXrB7iShpK" role="2H9Iav">
-            <ref role="112hCK" node="ZaBFheM00U" />
+            <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
           </node>
         </node>
       </node>
@@ -455,7 +455,7 @@
         <node concept="112hEE" id="1rXrB7iSySp" role="112hEJ">
           <node concept="113wzp" id="1rXrB7iSySq" role="113wzu">
             <node concept="112hFX" id="1rXrB7iSyUS" role="113wzq">
-              <ref role="112hCK" node="ZaBFheM00U" />
+              <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iSyUY" role="113wz4">
               <property role="2IPVms" value="7" />
@@ -467,7 +467,7 @@
             <property role="2IPVms" value="7" />
           </node>
           <node concept="112hFX" id="1rXrB7iSyUB" role="2H9Iav">
-            <ref role="112hCK" node="ZaBFheM00U" />
+            <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
           </node>
         </node>
       </node>
@@ -476,7 +476,7 @@
   </node>
   <node concept="2oyOwK" id="1xpXAu0Q0D5">
     <property role="TrG5h" value="_010_die_spec" />
-    <ref role="2oGCQt" node="ZaBFheK9QZ" />
+    <ref role="2oGCQt" node="ZaBFheK9QZ" resolve="_010_die" />
     <node concept="2ozijr" id="1xpXAu0Q0D6" role="2oyNpA">
       <property role="TrG5h" value="x" />
       <node concept="2owvKH" id="1xpXAu0QqIZ" role="112KhV" />
@@ -491,7 +491,7 @@
           <node concept="2oJwby" id="1xpXAu0X$cy" role="32OYtT">
             <node concept="110AQS" id="1xpXAu0X$cz" role="2H9Iav">
               <node concept="112hFX" id="1xpXAu0X$c$" role="2H9Iav">
-                <ref role="112hCK" node="ZaBFheM00U" />
+                <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
               </node>
               <node concept="2IPVmt" id="1xpXAu0X$c_" role="2H9Ial">
                 <property role="2IPVms" value="7" />
@@ -499,10 +499,10 @@
             </node>
             <node concept="110AQS" id="1xpXAu0X$cA" role="2H9Ial">
               <node concept="112hFX" id="1xpXAu0X$cB" role="2H9Ial">
-                <ref role="112hCK" node="1xpXAu0Q0D6" />
+                <ref role="112hCK" node="1xpXAu0Q0D6" resolve="x" />
               </node>
               <node concept="112hFX" id="1xpXAu0X$cC" role="2H9Iav">
-                <ref role="112hCK" node="ZaBFheMfar" />
+                <ref role="112hCK" node="ZaBFheMfar" resolve="d" />
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.formal.repo_admin/.mps/libraries.xml b/code/languages/com.mbeddr.formal.repo_admin/.mps/libraries.xml
new file mode 100644
index 000000000..6b84430d8
--- /dev/null
+++ b/code/languages/com.mbeddr.formal.repo_admin/.mps/libraries.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectLibraryManager">
+    <option name="libraries">
+      <map>
+        <entry key="dependencies">
+          <value>
+            <Library>
+              <option name="name" value="dependencies" />
+              <option name="path" value="${mbeddr.formal.home}/build/dependencies" />
+            </Library>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file
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 3c3a09993..b9ead9729 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
@@ -62,7 +62,7 @@
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" 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.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.editor.mps
index 9d97046dd..fccbd6f6a 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.editor.mps
@@ -4,7 +4,7 @@
   <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="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="0" />
+    <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>
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 3197d3fc8..f025bb9d5 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
@@ -31,7 +31,7 @@
     <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="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" />
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 b3d831aa0..b7749ee7c 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
@@ -3,7 +3,7 @@
   <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="0" />
+    <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" />
@@ -408,6 +408,9 @@
         <child id="5855146979801445196" name="width" index="2JxpDF" />
         <child id="5855146979801445211" name="height" index="2JxpDW" />
       </concept>
+      <concept id="8433227566816385664" name="de.itemis.mps.editor.diagram.structure.ILayoutAlgorithm" flags="ng" index="35SPa">
+        <child id="2064429317493348220" name="config" index="3pGojU" />
+      </concept>
       <concept id="6554619383003875357" name="de.itemis.mps.editor.diagram.structure.InlineEditorComponent" flags="ig" index="238au4" />
       <concept id="8433227566817223068" name="de.itemis.mps.editor.diagram.structure.LayeredLayoutAlgorithm" flags="ng" index="39fpm">
         <property id="7623784619795245948" name="direction" index="1NdBj4" />
@@ -459,6 +462,15 @@
       <concept id="5383048119156619323" name="de.itemis.mps.editor.diagram.structure.IDiagramElementsProvider" flags="ng" index="HB_m5">
         <child id="3155126767688717334" name="contentList" index="aCds2" />
       </concept>
+      <concept id="5878290447138467534" name="de.itemis.mps.editor.diagram.structure.Padding" flags="ng" index="POkNa">
+        <property id="5878290447138468454" name="top" index="POl1y" />
+        <property id="5878290447138468820" name="right" index="POl7g" />
+        <property id="5878290447138469609" name="bottom" index="POljH" />
+        <property id="5878290447138469821" name="left" index="POlmT" />
+      </concept>
+      <concept id="5878290447138443303" name="de.itemis.mps.editor.diagram.structure.ContentAlignment" flags="ng" index="POr8z">
+        <property id="5878290447138443694" name="alignment" index="POreE" />
+      </concept>
       <concept id="5112292084089908370" name="de.itemis.mps.editor.diagram.structure.EditorContextExpression" flags="ng" index="UMIS2" />
       <concept id="6237710625713195816" name="de.itemis.mps.editor.diagram.structure.CellModel_DiagramNode" flags="ng" index="2ZK4vF">
         <child id="7464726264117682823" name="shape" index="2xQQDV" />
@@ -471,6 +483,18 @@
       <concept id="6237710625713942002" name="de.itemis.mps.editor.diagram.structure.Content_BLQuery" flags="ig" index="2ZMM4L" />
       <concept id="6237710625713964946" name="de.itemis.mps.editor.diagram.structure.Parameter_Node" flags="ng" index="2ZN8Hh" />
       <concept id="5468226901223973329" name="de.itemis.mps.editor.diagram.structure.PortObject" flags="ng" index="15kUEO" />
+      <concept id="3662141892379115490" name="de.itemis.mps.editor.diagram.structure.Margin" flags="ng" index="36xZl7">
+        <property id="3662141892379115493" name="bottom" index="36xZl0" />
+        <property id="3662141892379115492" name="right" index="36xZl1" />
+        <property id="3662141892379115494" name="left" index="36xZl3" />
+        <property id="3662141892379115491" name="top" index="36xZl6" />
+      </concept>
+      <concept id="3662141892377043655" name="de.itemis.mps.editor.diagram.structure.ISupportTopdownPacking" flags="ng" index="36TQxy">
+        <property id="3662141892371757000" name="topdownHierarchicalNodeAspectRatio" index="31dVPH" />
+        <property id="3662141892371761113" name="topdownScaleFactor" index="31dWPW" />
+        <property id="3662141892374571168" name="topdownNodeType" index="36KE85" />
+        <property id="3662141892374569619" name="topdownHierarchicalNodeWidth" index="36KEwQ" />
+      </concept>
       <concept id="5051221038171022699" name="de.itemis.mps.editor.diagram.structure.ShadeColor" flags="lg" index="38c6YI" />
       <concept id="4277219764978107440" name="de.itemis.mps.editor.diagram.structure.SNodeConncetionType_toNode" flags="ng" index="3m_Ry6" />
       <concept id="4277219764978107398" name="de.itemis.mps.editor.diagram.structure.SNodeConncetionType_fromNode" flags="ng" index="3m_RyK" />
@@ -502,6 +526,59 @@
       </concept>
       <concept id="8637411062062623445" name="de.itemis.mps.editor.diagram.structure.Parameter_PaletteFolder_Concept" flags="ng" index="1yATlc" />
       <concept id="6987730699889040828" name="de.itemis.mps.editor.diagram.structure.LineColor" flags="lg" index="3C0NmK" />
+      <concept id="3333801137936756207" name="de.itemis.mps.editor.diagram.structure.LayeredLayoutConfig" flags="ng" index="3GLQun">
+        <property id="3662141892379183286" name="highDegreeNodeMaximumTreeHeight" index="36x08j" />
+        <property id="3662141892379184421" name="highDegreeNodeThreshold" index="36x0u0" />
+        <property id="3662141892379181918" name="hierarchicalSweepiness" index="36x0BV" />
+        <property id="3662141892379181279" name="greedySwitchCrossingminimizationHierarchical" index="36x0DU" />
+        <property id="3662141892379187702" name="improveCuts" index="36x1dj" />
+        <property id="3662141892379188269" name="improveWrappedEdges" index="36x1q8" />
+        <property id="3662141892379186382" name="horizontalSpacingBetweenLabelAndPort" index="36x1TF" />
+        <property id="3662141892379191931" name="labelSpacing" index="36x23u" />
+        <property id="3662141892379192633" name="layerBound" index="36x2us" />
+        <property id="3662141892379191100" name="labelNodeSpacing" index="36x2Qp" />
+        <property id="3662141892379194849" name="linearSegmentDeflectionDampening" index="36x3X4" />
+        <property id="3662141892379204315" name="maxNodePromotionIterations" index="36x51Y" />
+        <property id="3662141892379206070" name="mergeHierarchyCrossingEdges" index="36x6Gj" />
+        <property id="3662141892379207456" name="msdFreedom" index="36x6Q5" />
+        <property id="3662141892379211526" name="nodeNodeBetweenLayersSpacing" index="36x7Qz" />
+        <property id="3662141892379155187" name="crossingCounterPortInfluence" index="36x91m" />
+        <property id="3662141892379153202" name="correctionFactorForWrapping" index="36x9An" />
+        <property id="3662141892379154155" name="crossingCounterNodeInfluence" index="36x9Le" />
+        <property id="3662141892379160447" name="direction" index="36xanq" />
+        <property id="3662141892379162028" name="multiEdgeDistancePenalty" index="36xbW9" />
+        <property id="3662141892379167712" name="edgeNodeBetweenLayersSpacing" index="36xc55" />
+        <property id="3662141892379166982" name="edgeLabelSpacing" index="36xcez" />
+        <property id="3662141892379164867" name="edgeEdgeBetweenLayersSpacing" index="36xcDA" />
+        <property id="3662141892379171281" name="edgeSpacing" index="36xddO" />
+        <property id="3662141892379171857" name="edgeThickness" index="36xdqO" />
+        <property id="3662141892379168833" name="edgeNodeSpacing" index="36xdF$" />
+        <property id="3662141892379180082" name="greedySwitchCrossingminimization" index="36xfqn" />
+        <property id="3662141892379178639" name="greedySwitchActivationThreshold" index="36xfKE" />
+        <property id="3662141892379216113" name="nodeSelfLoopSpacing" index="36xo9k" />
+        <property id="3662141892379216986" name="nodeSpacing" index="36xorZ" />
+        <property id="3662141892379221784" name="randomizationSeed" index="36xpmX" />
+        <property id="3662141892379218932" name="portSpacing" index="36xp_h" />
+        <property id="3662141892379224606" name="slopedEdgeZoneWidth" index="36xq2V" />
+        <property id="3662141892379225514" name="sloppySplineLayerSpacingFactor" index="36xqsf" />
+        <property id="3662141892379223673" name="separateConnectedComponents" index="36xqNs" />
+        <property id="3662141892379228412" name="thoroughness" index="36xr9p" />
+        <property id="3662141892379226684" name="spacingBaseValue" index="36xryp" />
+        <property id="3662141892379230763" name="upperBoundOnWidthMinWidthLayerer" index="36xsye" />
+        <property id="3662141892379231963" name="upperLayerEstimationScalingFactorMinWidthLayerer" index="36xsLY" />
+        <property id="3662141892379238267" name="verticalSpacingBetweenLabelAndPort" index="36xtnu" />
+        <property id="3662141892379139136" name="additionalWrappedEdgesSpacing" index="36xPr_" />
+        <property id="3662141892379140237" name="aspectRatio" index="36xQCC" />
+        <property id="3662141892379147547" name="considerModelOrderStrategy" index="36xRuY" />
+        <property id="3662141892379145171" name="commentNodeSpacing" index="36xR_Q" />
+        <property id="3662141892379144303" name="commentCommentSpacing" index="36xRFa" />
+        <property id="3662141892379145832" name="componentsSpacing" index="36xRNd" />
+        <property id="2064429317495021368" name="subdiagramDirection" index="3p_KMY" />
+        <child id="3662141892379210077" name="nodeLabelPadding" index="36x7JS" />
+        <child id="3662141892379152132" name="contentAlignment" index="36x8mx" />
+        <child id="3662141892379217652" name="padding" index="36xohh" />
+        <child id="3662141892379113988" name="additionalPortSpace" index="36xZ2x" />
+      </concept>
       <concept id="8587703283519920118" name="de.itemis.mps.editor.diagram.structure.ThisNodeExpression" flags="ng" index="1Pxb5l" />
       <concept id="8587703283523590697" name="de.itemis.mps.editor.diagram.structure.ConnectionEndpoint" flags="ng" index="1PNbMa">
         <child id="9064581101900868073" name="target" index="ljJml" />
@@ -7160,6 +7237,83 @@
       </node>
       <node concept="39fpm" id="5rwT_JnuRbZ" role="35U2g">
         <property role="1NdBj4" value="6Bd7VwqYQBY/DOWN" />
+        <node concept="3GLQun" id="3M596RFvBLe" role="3pGojU">
+          <property role="36xPr_" value="10.0" />
+          <property role="36xQCC" value="1.6" />
+          <property role="36xRFa" value="10.0" />
+          <property role="36xR_Q" value="10.0" />
+          <property role="36xRNd" value="20.0" />
+          <property role="36xRuY" value="3biyEnOlw4F/PREFER_NODES" />
+          <property role="36x9An" value="1.0" />
+          <property role="36x9Le" value="0.0" />
+          <property role="36x91m" value="0.0" />
+          <property role="36xbW9" value="2.0" />
+          <property role="36xcDA" value="10.0" />
+          <property role="36xcez" value="2.0" />
+          <property role="36xc55" value="20.0" />
+          <property role="36xdF$" value="10.0" />
+          <property role="36xddO" value="10.0" />
+          <property role="36xdqO" value="1.0" />
+          <property role="36xfKE" value="40" />
+          <property role="36xfqn" value="3biyEnOlBXf/TWO_SIDED" />
+          <property role="36x0DU" value="3biyEnOlBXk/OFF" />
+          <property role="36x0BV" value="0.1" />
+          <property role="36x08j" value="5" />
+          <property role="36x0u0" value="16" />
+          <property role="36x1TF" value="1.0" />
+          <property role="36x1dj" value="true" />
+          <property role="36x1q8" value="true" />
+          <property role="36x2Qp" value="5.0" />
+          <property role="36x23u" value="0.0" />
+          <property role="36x2us" value="2147483647" />
+          <property role="36x3X4" value="0.3" />
+          <property role="36x51Y" value="0" />
+          <property role="36x6Gj" value="true" />
+          <property role="36x6Q5" value="1" />
+          <property role="36x7Qz" value="40.0" />
+          <property role="36xo9k" value="10.0" />
+          <property role="36xorZ" value="40.0" />
+          <property role="36xp_h" value="5.0" />
+          <property role="36xpmX" value="1" />
+          <property role="36xqNs" value="true" />
+          <property role="36xq2V" value="2.0" />
+          <property role="36xqsf" value="0.2" />
+          <property role="36xr9p" value="7" />
+          <property role="31dVPH" value="1.414" />
+          <property role="36KEwQ" value="15.0" />
+          <property role="36KE85" value="qwNnoEIHRM/HIERARCHICAL_NODE" />
+          <property role="31dWPW" value="1.0" />
+          <property role="36xsye" value="4" />
+          <property role="36xsLY" value="2" />
+          <property role="36xtnu" value="1.0" />
+          <property role="3p_KMY" value="6Bd7VwqYQBY/DOWN" />
+          <property role="36xanq" value="6Bd7VwqYQBY/DOWN" />
+          <property role="36xryp" value="40.0" />
+          <node concept="36xZl7" id="3M596RFvBLf" role="36xZ2x">
+            <property role="36xZl6" value="0.0" />
+            <property role="36xZl1" value="0.0" />
+            <property role="36xZl0" value="0.0" />
+            <property role="36xZl3" value="0.0" />
+          </node>
+          <node concept="POr8z" id="3M596RFvBLg" role="36x8mx">
+            <property role="POreE" value="56jSwh$g$O2/V_TOP" />
+          </node>
+          <node concept="POr8z" id="3M596RFvBLh" role="36x8mx">
+            <property role="POreE" value="56jSwh$g_03/H_LEFT" />
+          </node>
+          <node concept="POkNa" id="3M596RFvBLi" role="36x7JS">
+            <property role="POl1y" value="5.0" />
+            <property role="POl7g" value="5.0" />
+            <property role="POljH" value="5.0" />
+            <property role="POlmT" value="5.0" />
+          </node>
+          <node concept="POkNa" id="3M596RFvBLj" role="36xohh">
+            <property role="POl1y" value="12.0" />
+            <property role="POl7g" value="12.0" />
+            <property role="POljH" value="12.0" />
+            <property role="POlmT" value="12.0" />
+          </node>
+        </node>
       </node>
       <node concept="3mAFYk" id="5rwT_JnwhXM" role="1xLlFP">
         <property role="3m_KjL" value="Edge" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/com.mbeddr.formal.safety.cae.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/com.mbeddr.formal.safety.cae.mpl
index 2a5354cc1..85f94a898 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/com.mbeddr.formal.safety.cae.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/com.mbeddr.formal.safety.cae.mpl
@@ -23,7 +23,7 @@
   </dependencies>
   <languageVersions>
     <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="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.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 661fd3ea7..81008f691 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
@@ -4,7 +4,7 @@
   <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="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="0" />
+    <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="1" />
     <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>
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 1ecb6e989..e60789153 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
@@ -21,7 +21,7 @@
     <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="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.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 60fb284b4..5eaf43e9c 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,7 +10,7 @@
     <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="0" />
+    <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>
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 dc8d80b61..bd806d9cb 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
@@ -25,7 +25,7 @@
     <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="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" />
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 5b66b3c27..d9b67f9d3 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
@@ -6,7 +6,7 @@
     <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="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.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 e9982e98b..1838bcc0f 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
@@ -31,7 +31,7 @@
     <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="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" />
     <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" />
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 406e20e15..179bea85d 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
@@ -3,7 +3,7 @@
   <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="0" />
+    <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" />
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 4ca8d6b4e..917a89c1b 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
@@ -133,7 +133,7 @@
     <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="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/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 c0f5e4b9c..50d7d2cb3 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,7 @@
   <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="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.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 1a23dc90d..292aaf430 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
@@ -89,7 +89,7 @@
     <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="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.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 cbff00bd4..78481a63c 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,7 +3,7 @@
   <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="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/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 771db0ad1..56566971e 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
@@ -34,7 +34,7 @@
     <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: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="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" />
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 860d30eda..119501434 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
@@ -3,7 +3,7 @@
   <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="0" />
+    <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" />
@@ -561,6 +561,15 @@
         <child id="3155126767688717334" name="contentList" index="aCds2" />
       </concept>
       <concept id="621570459751009499" name="de.itemis.mps.editor.diagram.structure.EdgeEditor_CanSplit" flags="ig" index="KXoZh" />
+      <concept id="5878290447138467534" name="de.itemis.mps.editor.diagram.structure.Padding" flags="ng" index="POkNa">
+        <property id="5878290447138468454" name="top" index="POl1y" />
+        <property id="5878290447138468820" name="right" index="POl7g" />
+        <property id="5878290447138469609" name="bottom" index="POljH" />
+        <property id="5878290447138469821" name="left" index="POlmT" />
+      </concept>
+      <concept id="5878290447138443303" name="de.itemis.mps.editor.diagram.structure.ContentAlignment" flags="ng" index="POr8z">
+        <property id="5878290447138443694" name="alignment" index="POreE" />
+      </concept>
       <concept id="5112292084089908370" name="de.itemis.mps.editor.diagram.structure.EditorContextExpression" flags="ng" index="UMIS2" />
       <concept id="6237710625713195816" name="de.itemis.mps.editor.diagram.structure.CellModel_DiagramNode" flags="ng" index="2ZK4vF">
         <child id="7464726264117682823" name="shape" index="2xQQDV" />
@@ -571,10 +580,19 @@
       <concept id="6237710625713831199" name="de.itemis.mps.editor.diagram.structure.CellModel_DiagramConnector" flags="ng" index="2ZMJ7s" />
       <concept id="6237710625713942002" name="de.itemis.mps.editor.diagram.structure.Content_BLQuery" flags="ig" index="2ZMM4L" />
       <concept id="6237710625713964946" name="de.itemis.mps.editor.diagram.structure.Parameter_Node" flags="ng" index="2ZN8Hh" />
-      <concept id="5051221038171022699" name="de.itemis.mps.editor.diagram.structure.ShadeColor" flags="lg" index="38c6YI" />
-      <concept id="2064429317493348219" name="de.itemis.mps.editor.diagram.structure.DiagramLayoutConfig" flags="ng" index="3pGojX">
-        <property id="3028818438357202735" name="hierarchyHandling" index="2DpV5X" />
+      <concept id="3662141892379115490" name="de.itemis.mps.editor.diagram.structure.Margin" flags="ng" index="36xZl7">
+        <property id="3662141892379115493" name="bottom" index="36xZl0" />
+        <property id="3662141892379115492" name="right" index="36xZl1" />
+        <property id="3662141892379115494" name="left" index="36xZl3" />
+        <property id="3662141892379115491" name="top" index="36xZl6" />
+      </concept>
+      <concept id="3662141892377043655" name="de.itemis.mps.editor.diagram.structure.ISupportTopdownPacking" flags="ng" index="36TQxy">
+        <property id="3662141892371757000" name="topdownHierarchicalNodeAspectRatio" index="31dVPH" />
+        <property id="3662141892371761113" name="topdownScaleFactor" index="31dWPW" />
+        <property id="3662141892374571168" name="topdownNodeType" index="36KE85" />
+        <property id="3662141892374569619" name="topdownHierarchicalNodeWidth" index="36KEwQ" />
       </concept>
+      <concept id="5051221038171022699" name="de.itemis.mps.editor.diagram.structure.ShadeColor" flags="lg" index="38c6YI" />
       <concept id="6910723851735106293" name="de.itemis.mps.editor.diagram.structure.DiagramButtonConfig" flags="ng" index="3sA_1f">
         <property id="6910723851735128113" name="hasResetViewButton" index="3sAwEb" />
         <property id="6910723851735128106" name="hasRelayoutAllEdgesButton" index="3sAwEg" />
@@ -594,7 +612,58 @@
       <concept id="8637411062062623445" name="de.itemis.mps.editor.diagram.structure.Parameter_PaletteFolder_Concept" flags="ng" index="1yATlc" />
       <concept id="8637411062062430894" name="de.itemis.mps.editor.diagram.structure.Function_PaletteFolder" flags="ig" index="1yB8kR" />
       <concept id="3333801137936756207" name="de.itemis.mps.editor.diagram.structure.LayeredLayoutConfig" flags="ng" index="3GLQun">
+        <property id="3662141892379183286" name="highDegreeNodeMaximumTreeHeight" index="36x08j" />
+        <property id="3662141892379184421" name="highDegreeNodeThreshold" index="36x0u0" />
+        <property id="3662141892379181918" name="hierarchicalSweepiness" index="36x0BV" />
+        <property id="3662141892379181279" name="greedySwitchCrossingminimizationHierarchical" index="36x0DU" />
+        <property id="3662141892379187702" name="improveCuts" index="36x1dj" />
+        <property id="3662141892379188269" name="improveWrappedEdges" index="36x1q8" />
+        <property id="3662141892379186382" name="horizontalSpacingBetweenLabelAndPort" index="36x1TF" />
+        <property id="3662141892379191931" name="labelSpacing" index="36x23u" />
+        <property id="3662141892379192633" name="layerBound" index="36x2us" />
+        <property id="3662141892379191100" name="labelNodeSpacing" index="36x2Qp" />
+        <property id="3662141892379194849" name="linearSegmentDeflectionDampening" index="36x3X4" />
+        <property id="3662141892379204315" name="maxNodePromotionIterations" index="36x51Y" />
+        <property id="3662141892379206070" name="mergeHierarchyCrossingEdges" index="36x6Gj" />
+        <property id="3662141892379207456" name="msdFreedom" index="36x6Q5" />
+        <property id="3662141892379213488" name="nodePlacementStrategy" index="36x7gl" />
+        <property id="3662141892379211526" name="nodeNodeBetweenLayersSpacing" index="36x7Qz" />
+        <property id="3662141892379155187" name="crossingCounterPortInfluence" index="36x91m" />
+        <property id="3662141892379153202" name="correctionFactorForWrapping" index="36x9An" />
+        <property id="3662141892379154155" name="crossingCounterNodeInfluence" index="36x9Le" />
+        <property id="3662141892379160447" name="direction" index="36xanq" />
+        <property id="3662141892379162028" name="multiEdgeDistancePenalty" index="36xbW9" />
+        <property id="3662141892379167712" name="edgeNodeBetweenLayersSpacing" index="36xc55" />
+        <property id="3662141892379166982" name="edgeLabelSpacing" index="36xcez" />
+        <property id="3662141892379164867" name="edgeEdgeBetweenLayersSpacing" index="36xcDA" />
+        <property id="3662141892379171281" name="edgeSpacing" index="36xddO" />
+        <property id="3662141892379171857" name="edgeThickness" index="36xdqO" />
+        <property id="3662141892379168833" name="edgeNodeSpacing" index="36xdF$" />
+        <property id="3662141892379180082" name="greedySwitchCrossingminimization" index="36xfqn" />
+        <property id="3662141892379178639" name="greedySwitchActivationThreshold" index="36xfKE" />
+        <property id="3662141892379216113" name="nodeSelfLoopSpacing" index="36xo9k" />
+        <property id="3662141892379216986" name="nodeSpacing" index="36xorZ" />
+        <property id="3662141892379221784" name="randomizationSeed" index="36xpmX" />
+        <property id="3662141892379218932" name="portSpacing" index="36xp_h" />
+        <property id="3662141892379224606" name="slopedEdgeZoneWidth" index="36xq2V" />
+        <property id="3662141892379225514" name="sloppySplineLayerSpacingFactor" index="36xqsf" />
+        <property id="3662141892379223673" name="separateConnectedComponents" index="36xqNs" />
+        <property id="3662141892379228412" name="thoroughness" index="36xr9p" />
+        <property id="3662141892379226684" name="spacingBaseValue" index="36xryp" />
+        <property id="3662141892379230763" name="upperBoundOnWidthMinWidthLayerer" index="36xsye" />
+        <property id="3662141892379231963" name="upperLayerEstimationScalingFactorMinWidthLayerer" index="36xsLY" />
+        <property id="3662141892379238267" name="verticalSpacingBetweenLabelAndPort" index="36xtnu" />
+        <property id="3662141892379139136" name="additionalWrappedEdgesSpacing" index="36xPr_" />
+        <property id="3662141892379140237" name="aspectRatio" index="36xQCC" />
+        <property id="3662141892379147547" name="considerModelOrderStrategy" index="36xRuY" />
+        <property id="3662141892379145171" name="commentNodeSpacing" index="36xR_Q" />
+        <property id="3662141892379144303" name="commentCommentSpacing" index="36xRFa" />
+        <property id="3662141892379145832" name="componentsSpacing" index="36xRNd" />
         <property id="2064429317495021368" name="subdiagramDirection" index="3p_KMY" />
+        <child id="3662141892379210077" name="nodeLabelPadding" index="36x7JS" />
+        <child id="3662141892379152132" name="contentAlignment" index="36x8mx" />
+        <child id="3662141892379217652" name="padding" index="36xohh" />
+        <child id="3662141892379113988" name="additionalPortSpace" index="36xZ2x" />
       </concept>
       <concept id="8587703283519920118" name="de.itemis.mps.editor.diagram.structure.ThisNodeExpression" flags="ng" index="1Pxb5l" />
       <concept id="8587703283523590697" name="de.itemis.mps.editor.diagram.structure.ConnectionEndpoint" flags="ng" index="1PNbMa">
@@ -1386,12 +1455,6 @@
         <ref role="ehGHo" to="py52:2ccN23odOxd" resolve="GoalStructureConnectionBase" />
       </node>
     </node>
-    <node concept="1xmO9C" id="4VhhwF2gGW3" role="1xmOgE">
-      <property role="TrG5h" value="editorContext" />
-      <node concept="3uibUv" id="4VhhwF2gH5a" role="1xmOb1">
-        <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
-      </node>
-    </node>
     <node concept="2xDzp1" id="3GatLR2TX7C" role="2xOiiv">
       <node concept="3clFbS" id="3GatLR2TX7D" role="2VODD2">
         <node concept="3cpWs8" id="7z30MUmeewY" role="3cqZAp">
@@ -1640,6 +1703,12 @@
     <node concept="2x7zL7" id="2zzTeYjGOdZ" role="2x7_pA">
       <node concept="3clFbS" id="2zzTeYjGOe0" role="2VODD2" />
     </node>
+    <node concept="1xmO9C" id="4VhhwF2gGW3" role="1xmOgE">
+      <property role="TrG5h" value="editorContext" />
+      <node concept="3uibUv" id="4VhhwF2gH5a" role="1xmOb1">
+        <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
+      </node>
+    </node>
   </node>
   <node concept="2xDbr0" id="7TjUbLQ8uDG">
     <property role="TrG5h" value="GoalRectangle" />
@@ -2859,9 +2928,83 @@
       </node>
       <node concept="39fpm" id="42InK5baDIm" role="35U2g">
         <property role="1NdBj4" value="6Bd7VwqYQBY/DOWN" />
-        <node concept="3GLQun" id="6vCDfsKO5OL" role="3pGojU">
+        <node concept="3GLQun" id="5RDzpIVUtj1" role="3pGojU">
+          <property role="36xPr_" value="10.0" />
+          <property role="36xQCC" value="1.6" />
+          <property role="36xRFa" value="10.0" />
+          <property role="36xR_Q" value="10.0" />
+          <property role="36xRNd" value="40.0" />
+          <property role="36xRuY" value="3biyEnOlw4v/NONE" />
+          <property role="36x9An" value="1.0" />
+          <property role="36x9Le" value="0.0" />
+          <property role="36x91m" value="0.0" />
+          <property role="36xbW9" value="2.0" />
+          <property role="36xcDA" value="40.0" />
+          <property role="36xcez" value="2.0" />
+          <property role="36xc55" value="20.0" />
+          <property role="36xdF$" value="30.0" />
+          <property role="36xddO" value="20.0" />
+          <property role="36xdqO" value="1.0" />
+          <property role="36xfKE" value="40" />
+          <property role="36xfqn" value="3biyEnOlBXf/TWO_SIDED" />
+          <property role="36x0DU" value="3biyEnOlBXk/OFF" />
+          <property role="36x0BV" value="0.1" />
+          <property role="36x08j" value="5" />
+          <property role="36x0u0" value="16" />
+          <property role="36x1TF" value="1.0" />
+          <property role="36x1dj" value="true" />
+          <property role="36x1q8" value="true" />
+          <property role="36x2Qp" value="5.0" />
+          <property role="36x23u" value="0.0" />
+          <property role="36x2us" value="2147483647" />
+          <property role="36x3X4" value="0.3" />
+          <property role="36x51Y" value="0" />
+          <property role="36x6Gj" value="true" />
+          <property role="36x6Q5" value="1" />
+          <property role="36x7Qz" value="40.0" />
+          <property role="36xo9k" value="10.0" />
+          <property role="36xorZ" value="40.0" />
+          <property role="36xp_h" value="10.0" />
+          <property role="36xpmX" value="1" />
+          <property role="36xqNs" value="true" />
+          <property role="36xq2V" value="2.0" />
+          <property role="36xqsf" value="0.2" />
+          <property role="36xr9p" value="7" />
+          <property role="31dVPH" value="1.414" />
+          <property role="36KEwQ" value="150.0" />
+          <property role="36KE85" value="qwNnoEIHRQ/ROOT_NODE" />
+          <property role="31dWPW" value="1.0" />
+          <property role="36xsye" value="4" />
+          <property role="36xsLY" value="2" />
+          <property role="36xtnu" value="1.0" />
+          <property role="36xryp" value="40.0" />
+          <property role="36x7gl" value="3biyEnOlKd8/NETWORK_SIMPLEX" />
           <property role="3p_KMY" value="6Bd7VwqYQBY/DOWN" />
-          <property role="2DpV5X" value="64PP31wF2qq/INCLUDE_CHILDREN" />
+          <property role="36xanq" value="6Bd7VwqYQBY/DOWN" />
+          <node concept="36xZl7" id="5RDzpIVUtj2" role="36xZ2x">
+            <property role="36xZl6" value="0.0" />
+            <property role="36xZl1" value="0.0" />
+            <property role="36xZl0" value="0.0" />
+            <property role="36xZl3" value="0.0" />
+          </node>
+          <node concept="POr8z" id="5RDzpIVUtj3" role="36x8mx">
+            <property role="POreE" value="56jSwh$g$O2/V_TOP" />
+          </node>
+          <node concept="POr8z" id="5RDzpIVUtj4" role="36x8mx">
+            <property role="POreE" value="56jSwh$g_03/H_LEFT" />
+          </node>
+          <node concept="POkNa" id="5RDzpIVUtj5" role="36x7JS">
+            <property role="POl1y" value="5.0" />
+            <property role="POl7g" value="5.0" />
+            <property role="POljH" value="5.0" />
+            <property role="POlmT" value="5.0" />
+          </node>
+          <node concept="POkNa" id="5RDzpIVUtj6" role="36xohh">
+            <property role="POl1y" value="12.0" />
+            <property role="POl7g" value="12.0" />
+            <property role="POljH" value="12.0" />
+            <property role="POlmT" value="12.0" />
+          </node>
         </node>
       </node>
       <node concept="3sA_1f" id="6ucyvMUx0gv" role="3sAl1G">
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 5ae7fcdd6..71f9d8d61 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
@@ -26,7 +26,7 @@
     <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="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: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" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.editor.mps
index 455930a0b..b172fe025 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.editor.mps
@@ -3,7 +3,7 @@
   <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="0" />
+    <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="1" />
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
     <use id="31c91def-a131-41a1-9018-102874f49a12" name="de.slisson.mps.editor.multiline" version="0" />
     <use id="7e450f4e-1ac3-41ef-a851-4598161bdb94" name="de.slisson.mps.tables" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.sandbox/models/com.fasten.safety.ft.sandbox._010_ft_smoke.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.sandbox/models/com.fasten.safety.ft.sandbox._010_ft_smoke.mps
index 05edc2543..1f86ca46f 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.sandbox/models/com.fasten.safety.ft.sandbox._010_ft_smoke.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.sandbox/models/com.fasten.safety.ft.sandbox._010_ft_smoke.mps
@@ -116,7 +116,7 @@
       <node concept="37mRIm" id="5rwT_Jnw0S8" role="37mRID">
         <property role="37mO49" value="6260256764176895492" />
         <node concept="gqqVs" id="5rwT_Jnw0S7" role="37mO4d">
-          <property role="gqqTZ" value="12.0" />
+          <property role="gqqTZ" value="31.25000000000002" />
           <property role="gqqTW" value="116.0" />
           <property role="gqqTX" value="124.0" />
           <property role="gqqTy" value="50.0" />
@@ -171,7 +171,7 @@
       <node concept="37mRIm" id="3EWkVoQ5BRk" role="37mRID">
         <property role="37mO49" value="4232349791878020558" />
         <node concept="gqqVs" id="3EWkVoQ5BRj" role="37mO4d">
-          <property role="gqqTZ" value="156.0" />
+          <property role="gqqTZ" value="195.25000000000003" />
           <property role="gqqTW" value="83.0" />
           <property role="gqqTX" value="142.0" />
           <property role="gqqTy" value="83.0" />
@@ -182,7 +182,7 @@
           </node>
           <node concept="1pa3jb" id="3f8ZVRXXJgV" role="1pap1a">
             <property role="1pa3iD" value="97" />
-            <property role="2gRgW$" value="1703534386" />
+            <property role="2gRgW$" value="1737088818" />
           </node>
           <node concept="1pa3jb" id="3f8ZVRXXJgW" role="1pap1a">
             <property role="1pa3iD" value="67" />
@@ -190,7 +190,7 @@
           </node>
           <node concept="1pa3jb" id="3f8ZVRXZ8IU" role="1pap1a">
             <property role="1pa3iD" value="16" />
-            <property role="2gRgW$" value="1237500609" />
+            <property role="2gRgW$" value="1203946177" />
           </node>
         </node>
       </node>
@@ -254,36 +254,36 @@
       <node concept="37mRIm" id="3EWkVoQ6VEf" role="37mRID">
         <property role="37mO49" value="4232349791878363783" />
         <node concept="gqqVs" id="3EWkVoQ6VEe" role="37mO4d">
-          <property role="gqqTZ" value="192.531640625" />
+          <property role="gqqTZ" value="231.75000000000003" />
           <property role="gqqTW" value="206.0" />
           <property role="gqqTX" value="69.0" />
           <property role="gqqTy" value="92.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="3ZjKZgVJrLv" role="1pap1a">
             <property role="1pa3iD" value="source_port" />
-            <property role="2gRgW$" value="1526518510" />
+            <property role="2gRgW$" value="1518956948" />
           </node>
           <node concept="1pa3jb" id="3ZjKZgVJrLw" role="1pap1a">
             <property role="1pa3iD" value="target_port" />
-            <property role="2gRgW$" value="636683531" />
+            <property role="2gRgW$" value="629121969" />
           </node>
         </node>
       </node>
       <node concept="37mRIm" id="3EWkVoQ6VEQ" role="37mRID">
         <property role="37mO49" value="4232349791878363792" />
         <node concept="gqqVs" id="3EWkVoQ6VEP" role="37mO4d">
-          <property role="gqqTZ" value="199.0" />
+          <property role="gqqTZ" value="238.25000000000003" />
           <property role="gqqTW" value="12.0" />
           <property role="gqqTX" value="56.0" />
           <property role="gqqTy" value="50.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="3ZjKZgVJrLx" role="1pap1a">
             <property role="1pa3iD" value="source_port" />
-            <property role="2gRgW$" value="1465643347" />
+            <property role="2gRgW$" value="1336053817" />
           </node>
           <node concept="1pa3jb" id="3ZjKZgVJrLy" role="1pap1a">
             <property role="1pa3iD" value="target_port" />
-            <property role="2gRgW$" value="916383107" />
+            <property role="2gRgW$" value="786793577" />
           </node>
         </node>
       </node>
@@ -519,7 +519,7 @@
         <node concept="gqqVs" id="6csJveEVWmh" role="37mO4d">
           <property role="gqqTX" value="84.0" />
           <property role="gqqTy" value="92.0" />
-          <property role="gqqTZ" value="32.0" />
+          <property role="gqqTZ" value="51.25000000000002" />
           <property role="gqqTW" value="207.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="6csJveEVWqh" role="1pap1a">
@@ -528,11 +528,11 @@
           </node>
           <node concept="1pa3jb" id="3f8ZVRXXJgX" role="1pap1a">
             <property role="1pa3iD" value="38" />
-            <property role="2gRgW$" value="1274800554" />
+            <property role="2gRgW$" value="1237344444" />
           </node>
           <node concept="1pa3jb" id="3f8ZVRXXJgY" role="1pap1a">
             <property role="1pa3iD" value="60" />
-            <property role="2gRgW$" value="1553640485" />
+            <property role="2gRgW$" value="1591096595" />
           </node>
         </node>
       </node>
@@ -541,7 +541,7 @@
         <node concept="gqqVs" id="6csJveEVWmk" role="37mO4d">
           <property role="gqqTX" value="91.0" />
           <property role="gqqTy" value="50.0" />
-          <property role="gqqTZ" value="281.531640625" />
+          <property role="gqqTZ" value="340.75" />
           <property role="gqqTW" value="207.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="6csJveEVWql" role="1pap1a">
@@ -555,7 +555,7 @@
         <node concept="gqqVs" id="6csJveEVWmo" role="37mO4d">
           <property role="gqqTX" value="76.0" />
           <property role="gqqTy" value="50.0" />
-          <property role="gqqTZ" value="136.95" />
+          <property role="gqqTZ" value="146.0" />
           <property role="gqqTW" value="340.09998779296876" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="6csJveEVWqm" role="1pap1a">
@@ -573,7 +573,7 @@
         <node concept="gqqVs" id="6csJveEVWms" role="37mO4d">
           <property role="gqqTX" value="94.0" />
           <property role="gqqTy" value="83.0" />
-          <property role="gqqTZ" value="22.950000000000003" />
+          <property role="gqqTZ" value="12.0" />
           <property role="gqqTW" value="339.29998779296875" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="6csJveEVWqo" role="1pap1a">
@@ -615,18 +615,27 @@
         <property role="37mO49" value="5855146979797487297" />
         <node concept="2VclpC" id="551EivYxWWO" role="37mO4d">
           <node concept="2VclrF" id="2ynKV3BxqL8" role="2Vcluh">
-            <property role="2Vclpx" value="236.03671875" />
+            <property role="2Vclpx" value="302.0" />
             <property role="2Vclpz" value="186.0" />
           </node>
           <node concept="2VclrF" id="2ynKV3BxqL9" role="2Vcluh">
-            <property role="2Vclpx" value="328.031640625" />
+            <property role="2Vclpx" value="386.25" />
             <property role="2Vclpz" value="186.0" />
           </node>
         </node>
       </node>
       <node concept="37mRIm" id="551EivYxWWT" role="37mRID">
         <property role="37mO49" value="5855146979797487338" />
-        <node concept="2VclpC" id="551EivYxWWS" role="37mO4d" />
+        <node concept="2VclpC" id="551EivYxWWS" role="37mO4d">
+          <node concept="2VclrF" id="3M596RFyfsZ" role="2Vcluh">
+            <property role="2Vclpx" value="79.08333333333334" />
+            <property role="2Vclpz" value="319.29998779296875" />
+          </node>
+          <node concept="2VclrF" id="3M596RFyft0" role="2Vcluh">
+            <property role="2Vclpx" value="59.0" />
+            <property role="2Vclpz" value="319.29998779296875" />
+          </node>
+        </node>
       </node>
       <node concept="37mRIm" id="551EivYxWWW" role="37mRID">
         <property role="37mO49" value="5855146979797487383" />
@@ -645,11 +654,11 @@
         <property role="37mO49" value="5855146979797487360" />
         <node concept="2VclpC" id="3f8ZVRXXJh0" role="37mO4d">
           <node concept="2VclrF" id="2ynKV3BxqLa" role="2Vcluh">
-            <property role="2Vclpx" value="79.05" />
+            <property role="2Vclpx" value="107.41666666666669" />
             <property role="2Vclpz" value="319.29998779296875" />
           </node>
           <node concept="2VclrF" id="2ynKV3BxqLb" role="2Vcluh">
-            <property role="2Vclpx" value="175.95" />
+            <property role="2Vclpx" value="184.00000000000003" />
             <property role="2Vclpz" value="319.29998779296875" />
           </node>
         </node>
@@ -662,11 +671,11 @@
         <property role="37mO49" value="3731513482751544216" />
         <node concept="2VclpC" id="3f8ZVRXZ8IV" role="37mO4d">
           <node concept="2VclrF" id="3f8ZVRXZ8IX" role="2Vcluh">
-            <property role="2Vclpx" value="219.931640625" />
+            <property role="2Vclpx" value="230.50000000000003" />
             <property role="2Vclpz" value="186.0" />
           </node>
           <node concept="2VclrF" id="3f8ZVRXZ8IY" role="2Vcluh">
-            <property role="2Vclpx" value="75.0" />
+            <property role="2Vclpx" value="93.25000000000003" />
             <property role="2Vclpz" value="186.0" />
           </node>
         </node>
@@ -1205,8 +1214,8 @@
       <node concept="37mRIm" id="1SpkZ1V8SqV" role="37mRID">
         <property role="37mO49" value="2168856987878786715" />
         <node concept="gqqVs" id="1SpkZ1V8SqU" role="37mO4d">
-          <property role="gqqTZ" value="30.950000000000003" />
-          <property role="gqqTW" value="230.65" />
+          <property role="gqqTZ" value="12.0" />
+          <property role="gqqTW" value="230.6" />
           <property role="gqqTX" value="96.0" />
           <property role="gqqTy" value="92.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
@@ -1223,7 +1232,7 @@
       <node concept="37mRIm" id="1SpkZ1V8SqZ" role="37mRID">
         <property role="37mO49" value="2168856987878786717" />
         <node concept="gqqVs" id="1SpkZ1V8SqY" role="37mO4d">
-          <property role="gqqTZ" value="12.0" />
+          <property role="gqqTZ" value="12.83333333333334" />
           <property role="gqqTW" value="107.0" />
           <property role="gqqTX" value="142.0" />
           <property role="gqqTy" value="83.0" />
@@ -1234,18 +1243,18 @@
           </node>
           <node concept="1pa3jb" id="3f8ZVRXPiCO" role="1pap1a">
             <property role="1pa3iD" value="14" />
-            <property role="2gRgW$" value="1315172905" />
+            <property role="2gRgW$" value="1292803284" />
           </node>
           <node concept="1pa3jb" id="3f8ZVRXPiCP" role="1pap1a">
             <property role="1pa3iD" value="28" />
-            <property role="2gRgW$" value="1625862090" />
+            <property role="2gRgW$" value="1648231712" />
           </node>
         </node>
       </node>
       <node concept="37mRIm" id="1SpkZ1V8Sr4" role="37mRID">
         <property role="37mO49" value="2168856987878786724" />
         <node concept="gqqVs" id="1SpkZ1V8Sr3" role="37mO4d">
-          <property role="gqqTZ" value="174.0" />
+          <property role="gqqTZ" value="194.83333333333337" />
           <property role="gqqTW" value="140.0" />
           <property role="gqqTX" value="124.0" />
           <property role="gqqTy" value="50.0" />
@@ -1263,7 +1272,7 @@
       <node concept="37mRIm" id="1SpkZ1V8Sr8" role="37mRID">
         <property role="37mO49" value="2168856987878786728" />
         <node concept="gqqVs" id="1SpkZ1V8Sr7" role="37mO4d">
-          <property role="gqqTZ" value="43.0" />
+          <property role="gqqTZ" value="43.83333333333334" />
           <property role="gqqTW" value="12.0" />
           <property role="gqqTX" value="80.0" />
           <property role="gqqTy" value="74.0" />
@@ -1375,14 +1384,14 @@
       <node concept="37mRIm" id="1SpkZ1V8SLR" role="37mRID">
         <property role="37mO49" value="2168856987878788198" />
         <node concept="gqqVs" id="1SpkZ1V8SLQ" role="37mO4d">
-          <property role="gqqTZ" value="171.0" />
-          <property role="gqqTW" value="230.65" />
-          <property role="gqqTX" value="130.0" />
-          <property role="gqqTy" value="105.0" />
+          <property role="gqqTZ" value="189.33333333333337" />
+          <property role="gqqTW" value="230.6" />
+          <property role="gqqTX" value="135.0" />
+          <property role="gqqTy" value="106.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="6csJveEW0qd" role="1pap1a">
             <property role="1pa3iD" value="target_port" />
-            <property role="2gRgW$" value="582423594" />
+            <property role="2gRgW$" value="582720471" />
           </node>
         </node>
       </node>
@@ -1403,11 +1412,11 @@
         <property role="37mO49" value="7141791963345323628" />
         <node concept="2VclpC" id="6csJveEW0qe" role="37mO4d">
           <node concept="2VclrF" id="6csJveEW0qg" role="2Vcluh">
-            <property role="2Vclpx" value="88.05" />
+            <property role="2Vclpx" value="107.66666666666667" />
             <property role="2Vclpz" value="210.0" />
           </node>
           <node concept="2VclrF" id="6csJveEW0qh" role="2Vcluh">
-            <property role="2Vclpx" value="237.0" />
+            <property role="2Vclpx" value="256.83333333333337" />
             <property role="2Vclpz" value="210.0" />
           </node>
         </node>
@@ -2097,8 +2106,8 @@
       <node concept="37mRIm" id="1SpkZ1V8S_H" role="37mRID">
         <property role="37mO49" value="2168856987878787407" />
         <node concept="gqqVs" id="1SpkZ1V8S_G" role="37mO4d">
-          <property role="gqqTZ" value="228.0" />
-          <property role="gqqTW" value="217.8" />
+          <property role="gqqTZ" value="137.0" />
+          <property role="gqqTW" value="197.8" />
           <property role="gqqTX" value="76.0" />
           <property role="gqqTy" value="50.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
@@ -2115,8 +2124,8 @@
       <node concept="37mRIm" id="1SpkZ1V8S_L" role="37mRID">
         <property role="37mO49" value="2168856987878787409" />
         <node concept="gqqVs" id="1SpkZ1V8S_K" role="37mO4d">
-          <property role="gqqTZ" value="123.0" />
-          <property role="gqqTW" value="217.0" />
+          <property role="gqqTZ" value="12.0" />
+          <property role="gqqTW" value="197.0" />
           <property role="gqqTX" value="85.0" />
           <property role="gqqTy" value="83.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
@@ -2133,26 +2142,26 @@
       <node concept="37mRIm" id="1SpkZ1V8S_P" role="37mRID">
         <property role="37mO49" value="2168856987878787417" />
         <node concept="gqqVs" id="1SpkZ1V8S_O" role="37mO4d">
-          <property role="gqqTZ" value="21.068359375" />
+          <property role="gqqTZ" value="130.5" />
           <property role="gqqTW" value="83.0" />
           <property role="gqqTX" value="89.0" />
           <property role="gqqTy" value="74.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="1SpkZ1V8S_Q" role="1pap1a">
             <property role="1pa3iD" value="port" />
-            <property role="2gRgW$" value="595867714" />
+            <property role="2gRgW$" value="525071550" />
           </node>
           <node concept="1pa3jb" id="2ynKV3ByXN3" role="1pap1a">
             <property role="1pa3iD" value="27" />
-            <property role="2gRgW$" value="1480291900" />
+            <property role="2gRgW$" value="1144010121" />
           </node>
           <node concept="1pa3jb" id="2ynKV3ByXN4" role="1pap1a">
             <property role="1pa3iD" value="42" />
-            <property role="2gRgW$" value="1728078475" />
+            <property role="2gRgW$" value="1409495736" />
           </node>
           <node concept="1pa3jb" id="2ynKV3ByXN5" role="1pap1a">
             <property role="1pa3iD" value="58" />
-            <property role="2gRgW$" value="1232505326" />
+            <property role="2gRgW$" value="1674981352" />
           </node>
         </node>
       </node>
@@ -2199,18 +2208,18 @@
       <node concept="37mRIm" id="1SpkZ1V8SA4" role="37mRID">
         <property role="37mO49" value="2168856987878787428" />
         <node concept="gqqVs" id="1SpkZ1V8SA3" role="37mO4d">
-          <property role="gqqTZ" value="31.568359375" />
+          <property role="gqqTZ" value="141.0" />
           <property role="gqqTW" value="12.0" />
           <property role="gqqTX" value="68.0" />
           <property role="gqqTy" value="50.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="1SpkZ1V8SA5" role="1pap1a">
             <property role="1pa3iD" value="source_port" />
-            <property role="2gRgW$" value="1354566607" />
+            <property role="2gRgW$" value="1339227438" />
           </node>
           <node concept="1pa3jb" id="1SpkZ1V8SA6" role="1pap1a">
             <property role="1pa3iD" value="target_port" />
-            <property role="2gRgW$" value="805306367" />
+            <property role="2gRgW$" value="789967198" />
           </node>
         </node>
       </node>
@@ -2235,8 +2244,8 @@
       <node concept="37mRIm" id="1SpkZ1V8SAc" role="37mRID">
         <property role="37mO49" value="2168856987878787434" />
         <node concept="gqqVs" id="1SpkZ1V8SAb" role="37mO4d">
-          <property role="gqqTZ" value="12.0" />
-          <property role="gqqTW" value="217.8" />
+          <property role="gqqTZ" value="253.0" />
+          <property role="gqqTW" value="197.8" />
           <property role="gqqTX" value="91.0" />
           <property role="gqqTy" value="83.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
@@ -2329,28 +2338,19 @@
       <node concept="37mRIm" id="2ynKV3ByXN8" role="37mRID">
         <property role="37mO49" value="7141791963345323927" />
         <node concept="2VclpC" id="2ynKV3ByXN7" role="37mO4d">
-          <node concept="2VclrF" id="2ynKV3ByXN9" role="2Vcluh">
-            <property role="2Vclpx" value="66.6" />
-            <property role="2Vclpz" value="197.0" />
+          <node concept="2VclrF" id="3M596RFMTx8" role="2Vcluh">
+            <property role="2Vclpx" value="152.5" />
+            <property role="2Vclpz" value="177.0" />
           </node>
-          <node concept="2VclrF" id="2ynKV3ByXNa" role="2Vcluh">
-            <property role="2Vclpx" value="166.5" />
-            <property role="2Vclpz" value="197.0" />
+          <node concept="2VclrF" id="3M596RFMTx9" role="2Vcluh">
+            <property role="2Vclpx" value="54.5" />
+            <property role="2Vclpz" value="177.0" />
           </node>
         </node>
       </node>
       <node concept="37mRIm" id="2ynKV3ByXNc" role="37mRID">
         <property role="37mO49" value="7141791963345323942" />
-        <node concept="2VclpC" id="2ynKV3ByXNb" role="37mO4d">
-          <node concept="2VclrF" id="2ynKV3ByXNd" role="2Vcluh">
-            <property role="2Vclpx" value="74.605078125" />
-            <property role="2Vclpz" value="177.0" />
-          </node>
-          <node concept="2VclrF" id="2ynKV3ByXNe" role="2Vcluh">
-            <property role="2Vclpx" value="267.0" />
-            <property role="2Vclpz" value="177.0" />
-          </node>
-        </node>
+        <node concept="2VclpC" id="2ynKV3ByXNb" role="37mO4d" />
       </node>
     </node>
     <node concept="21ATtL" id="1SpkZ1V8S_f" role="3CrHoS">
@@ -2998,7 +2998,7 @@
       <node concept="37mRIm" id="551EivYysgX" role="37mRID">
         <property role="37mO49" value="5855146979797615650" />
         <node concept="gqqVs" id="551EivYysgW" role="37mO4d">
-          <property role="gqqTZ" value="723.9102345647372" />
+          <property role="gqqTZ" value="693.5" />
           <property role="gqqTW" value="12.0" />
           <property role="gqqTX" value="124.0" />
           <property role="gqqTy" value="50.0" />
@@ -3034,42 +3034,42 @@
       <node concept="37mRIm" id="551EivYysh5" role="37mRID">
         <property role="37mO49" value="5855146979797615654" />
         <node concept="gqqVs" id="551EivYysh4" role="37mO4d">
-          <property role="gqqTZ" value="628.0066267359155" />
+          <property role="gqqTZ" value="320.0" />
           <property role="gqqTW" value="102.0" />
           <property role="gqqTX" value="84.0" />
           <property role="gqqTy" value="60.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="551EivYysh6" role="1pap1a">
             <property role="1pa3iD" value="port" />
-            <property role="2gRgW$" value="1395864369" />
+            <property role="2gRgW$" value="846508088" />
           </node>
           <node concept="1pa3jb" id="5kIAo_xL0jL" role="1pap1a">
             <property role="1pa3iD" value="63" />
-            <property role="2gRgW$" value="1235364938" />
+            <property role="2gRgW$" value="1524089120" />
           </node>
           <node concept="1pa3jb" id="5kIAo_xL0jM" role="1pap1a">
             <property role="1pa3iD" value="50" />
-            <property role="2gRgW$" value="1497557708" />
+            <property role="2gRgW$" value="1789403233" />
           </node>
           <node concept="1pa3jb" id="5kIAo_xL0jN" role="1pap1a">
             <property role="1pa3iD" value="04" />
-            <property role="2gRgW$" value="1940788345" />
+            <property role="2gRgW$" value="1656746176" />
           </node>
           <node concept="1pa3jb" id="5kIAo_xL0jO" role="1pap1a">
             <property role="1pa3iD" value="26" />
-            <property role="2gRgW$" value="1940788345" />
+            <property role="2gRgW$" value="1391432063" />
           </node>
           <node concept="1pa3jb" id="5kIAo_xL0jP" role="1pap1a">
             <property role="1pa3iD" value="76" />
-            <property role="2gRgW$" value="1940788345" />
+            <property role="2gRgW$" value="1126117950" />
           </node>
           <node concept="1pa3jb" id="5kIAo_xL0jQ" role="1pap1a">
             <property role="1pa3iD" value="90" />
-            <property role="2gRgW$" value="1759750479" />
+            <property role="2gRgW$" value="993460893" />
           </node>
           <node concept="1pa3jb" id="5kIAo_xL0jR" role="1pap1a">
             <property role="1pa3iD" value="65" />
-            <property role="2gRgW$" value="1940788345" />
+            <property role="2gRgW$" value="1258775006" />
           </node>
         </node>
       </node>
@@ -3090,8 +3090,8 @@
       <node concept="37mRIm" id="551EivYyshe" role="37mRID">
         <property role="37mO49" value="5855146979797615656" />
         <node concept="gqqVs" id="551EivYyshd" role="37mO4d">
-          <property role="gqqTZ" value="180.13857946917824" />
-          <property role="gqqTW" value="302.8" />
+          <property role="gqqTZ" value="700.0" />
+          <property role="gqqTW" value="222.8" />
           <property role="gqqTX" value="76.0" />
           <property role="gqqTy" value="50.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
@@ -3108,8 +3108,8 @@
       <node concept="37mRIm" id="551EivYyshi" role="37mRID">
         <property role="37mO49" value="5855146979797615658" />
         <node concept="gqqVs" id="551EivYyshh" role="37mO4d">
-          <property role="gqqTZ" value="80.13857946917824" />
-          <property role="gqqTW" value="302.8" />
+          <property role="gqqTZ" value="448.0" />
+          <property role="gqqTW" value="222.8" />
           <property role="gqqTX" value="80.0" />
           <property role="gqqTy" value="50.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
@@ -3130,13 +3130,13 @@
       <node concept="37mRIm" id="551EivYyshq" role="37mRID">
         <property role="37mO49" value="5855146979797615663" />
         <node concept="2VclpC" id="551EivYyshp" role="37mO4d">
-          <node concept="2VclrF" id="2ynKV3ByXRM" role="2Vcluh">
-            <property role="2Vclpx" value="646.8931451016426" />
-            <property role="2Vclpz" value="182.0" />
+          <node concept="2VclrF" id="3M596RFMTvP" role="2Vcluh">
+            <property role="2Vclpx" value="372.625" />
+            <property role="2Vclpz" value="202.0" />
           </node>
-          <node concept="2VclrF" id="2ynKV3ByXRN" role="2Vcluh">
-            <property role="2Vclpx" value="121.13857946917824" />
-            <property role="2Vclpz" value="182.0" />
+          <node concept="2VclrF" id="3M596RFMTvQ" role="2Vcluh">
+            <property role="2Vclpx" value="488.0" />
+            <property role="2Vclpz" value="202.0" />
           </node>
         </node>
       </node>
@@ -3171,8 +3171,8 @@
         <node concept="gqqVs" id="551EivYysqc" role="37mO4d">
           <property role="gqqTX" value="92.0" />
           <property role="gqqTy" value="50.0" />
-          <property role="gqqTZ" value="356.13857946917824" />
-          <property role="gqqTW" value="302.8" />
+          <property role="gqqTZ" value="568.0" />
+          <property role="gqqTW" value="222.8" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="551EivYys_h" role="1pap1a">
             <property role="1pa3iD" value="target_port" />
@@ -3189,8 +3189,8 @@
         <node concept="gqqVs" id="551EivYystt" role="37mO4d">
           <property role="gqqTX" value="92.0" />
           <property role="gqqTy" value="50.0" />
-          <property role="gqqTZ" value="468.13857946917824" />
-          <property role="gqqTW" value="302.8" />
+          <property role="gqqTZ" value="316.0" />
+          <property role="gqqTW" value="222.8" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="551EivYys_j" role="1pap1a">
             <property role="1pa3iD" value="target_port" />
@@ -3207,16 +3207,16 @@
         <node concept="gqqVs" id="551EivYyswM" role="37mO4d">
           <property role="gqqTX" value="64.0" />
           <property role="gqqTy" value="50.0" />
-          <property role="gqqTZ" value="580.1385794691782" />
-          <property role="gqqTW" value="302.8" />
+          <property role="gqqTZ" value="112.0" />
+          <property role="gqqTW" value="222.8" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="551EivYys_l" role="1pap1a">
             <property role="1pa3iD" value="target_port" />
-            <property role="2gRgW$" value="676782724" />
+            <property role="2gRgW$" value="627976278" />
           </node>
           <node concept="1pa3jb" id="551EivYys_m" role="1pap1a">
             <property role="1pa3iD" value="source_port" />
-            <property role="2gRgW$" value="1548165511" />
+            <property role="2gRgW$" value="1499359065" />
           </node>
         </node>
       </node>
@@ -3224,12 +3224,12 @@
         <property role="37mO49" value="5855146979797616250" />
         <node concept="2VclpC" id="551EivYys_p" role="37mO4d">
           <node concept="2VclrF" id="2ynKV3ByXRO" role="2Vcluh">
-            <property role="2Vclpx" value="654.9151666322833" />
-            <property role="2Vclpz" value="202.0" />
+            <property role="2Vclpx" value="393.875" />
+            <property role="2Vclpz" value="182.0" />
           </node>
           <node concept="2VclrF" id="2ynKV3ByXRP" role="2Vcluh">
-            <property role="2Vclpx" value="219.13857946917824" />
-            <property role="2Vclpz" value="202.0" />
+            <property role="2Vclpx" value="738.0" />
+            <property role="2Vclpz" value="182.0" />
           </node>
         </node>
       </node>
@@ -3237,12 +3237,12 @@
         <property role="37mO49" value="5855146979797616904" />
         <node concept="2VclpC" id="551EivYys_s" role="37mO4d">
           <node concept="2VclrF" id="2ynKV3ByXRQ" role="2Vcluh">
-            <property role="2Vclpx" value="670.9748739870759" />
-            <property role="2Vclpz" value="242.0" />
+            <property role="2Vclpx" value="383.25" />
+            <property role="2Vclpz" value="192.0" />
           </node>
           <node concept="2VclrF" id="2ynKV3ByXRR" role="2Vcluh">
-            <property role="2Vclpx" value="403.13857946917824" />
-            <property role="2Vclpz" value="242.0" />
+            <property role="2Vclpx" value="614.0" />
+            <property role="2Vclpz" value="192.0" />
           </node>
         </node>
       </node>
@@ -3252,26 +3252,17 @@
       </node>
       <node concept="37mRIm" id="551EivYysDj" role="37mRID">
         <property role="37mO49" value="5855146979797616926" />
-        <node concept="2VclpC" id="551EivYysDi" role="37mO4d">
-          <node concept="2VclrF" id="2ynKV3ByXRS" role="2Vcluh">
-            <property role="2Vclpx" value="679.0748739870759" />
-            <property role="2Vclpz" value="262.0" />
-          </node>
-          <node concept="2VclrF" id="2ynKV3ByXRT" role="2Vcluh">
-            <property role="2Vclpx" value="515.1385794691782" />
-            <property role="2Vclpz" value="262.0" />
-          </node>
-        </node>
+        <node concept="2VclpC" id="551EivYysDi" role="37mO4d" />
       </node>
       <node concept="37mRIm" id="551EivY_fHN" role="37mRID">
         <property role="37mO49" value="5855146979797615662" />
         <node concept="2VclpC" id="551EivY_fHM" role="37mO4d">
           <node concept="2VclrF" id="2ynKV3ByXRK" role="2Vcluh">
-            <property role="2Vclpx" value="786.9102345647372" />
+            <property role="2Vclpx" value="755.5" />
             <property role="2Vclpz" value="82.0" />
           </node>
           <node concept="2VclrF" id="2ynKV3ByXRL" role="2Vcluh">
-            <property role="2Vclpx" value="671.0066267359155" />
+            <property role="2Vclpx" value="362.0" />
             <property role="2Vclpz" value="82.0" />
           </node>
         </node>
@@ -3289,25 +3280,25 @@
       <node concept="37mRIm" id="551EivYEVDw" role="37mRID">
         <property role="37mO49" value="5855146979799841350" />
         <node concept="gqqVs" id="551EivYEVDv" role="37mO4d">
-          <property role="gqqTZ" value="276.13857946917824" />
-          <property role="gqqTW" value="302.8" />
+          <property role="gqqTZ" value="12.0" />
+          <property role="gqqTW" value="222.8" />
           <property role="gqqTX" value="60.0" />
           <property role="gqqTy" value="50.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="2ynKV3ByXRe" role="1pap1a">
             <property role="1pa3iD" value="target_port" />
-            <property role="2gRgW$" value="713518759" />
+            <property role="2gRgW$" value="626926677" />
           </node>
           <node concept="1pa3jb" id="2ynKV3ByXRf" role="1pap1a">
             <property role="1pa3iD" value="source_port" />
-            <property role="2gRgW$" value="1584901546" />
+            <property role="2gRgW$" value="1498309464" />
           </node>
         </node>
       </node>
       <node concept="37mRIm" id="3f8ZVRXZClB" role="37mRID">
         <property role="37mO49" value="3731513482751673674" />
         <node concept="gqqVs" id="3f8ZVRXZClA" role="37mO4d">
-          <property role="gqqTZ" value="546.0066267359155" />
+          <property role="gqqTZ" value="781.0" />
           <property role="gqqTW" value="102.0" />
           <property role="gqqTX" value="62.0" />
           <property role="gqqTy" value="60.0" />
@@ -3321,7 +3312,7 @@
       <node concept="37mRIm" id="3f8ZVRXZCz5" role="37mRID">
         <property role="37mO49" value="3731513482751673948" />
         <node concept="gqqVs" id="3f8ZVRXZCz4" role="37mO4d">
-          <property role="gqqTZ" value="755.9102345647372" />
+          <property role="gqqTZ" value="1220.0" />
           <property role="gqqTW" value="102.0" />
           <property role="gqqTX" value="60.0" />
           <property role="gqqTy" value="60.0" />
@@ -3339,58 +3330,58 @@
       <node concept="37mRIm" id="5kIAo_xDUwV" role="37mRID">
         <property role="37mO49" value="6138012157480511512" />
         <node concept="gqqVs" id="5kIAo_xDUwU" role="37mO4d">
-          <property role="gqqTZ" value="744.1385794691782" />
-          <property role="gqqTW" value="302.0" />
-          <property role="gqqTX" value="85.36142053082175" />
+          <property role="gqqTZ" value="1219.2125455638259" />
+          <property role="gqqTW" value="222.0" />
+          <property role="gqqTX" value="62.0" />
           <property role="gqqTy" value="60.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="2ynKV3ByXRi" role="1pap1a">
             <property role="1pa3iD" value="port" />
-            <property role="2gRgW$" value="1449551461" />
+            <property role="2gRgW$" value="892337410" />
           </node>
           <node concept="1pa3jb" id="2ynKV3ByXRj" role="1pap1a">
             <property role="1pa3iD" value="26" />
-            <property role="2gRgW$" value="1771674007" />
+            <property role="2gRgW$" value="1087739357" />
           </node>
           <node concept="1pa3jb" id="2ynKV3ByXRk" role="1pap1a">
             <property role="1pa3iD" value="78" />
-            <property role="2gRgW$" value="1068216941" />
+            <property role="2gRgW$" value="546516281" />
           </node>
           <node concept="1pa3jb" id="2ynKV3ByXRl" role="1pap1a">
             <property role="1pa3iD" value="20" />
-            <property role="2gRgW$" value="1595402018" />
+            <property role="2gRgW$" value="961018756" />
           </node>
           <node concept="1pa3jb" id="2ynKV3ByXRm" role="1pap1a">
             <property role="1pa3iD" value="63" />
-            <property role="2gRgW$" value="1771674007" />
+            <property role="2gRgW$" value="1214459957" />
           </node>
           <node concept="1pa3jb" id="2ynKV3ByXRn" role="1pap1a">
             <property role="1pa3iD" value="07" />
-            <property role="2gRgW$" value="1771674007" />
+            <property role="2gRgW$" value="1341180558" />
           </node>
           <node concept="1pa3jb" id="2ynKV3ByXRo" role="1pap1a">
             <property role="1pa3iD" value="94" />
-            <property role="2gRgW$" value="1771674007" />
+            <property role="2gRgW$" value="1467901158" />
           </node>
           <node concept="1pa3jb" id="2ynKV3ByXRp" role="1pap1a">
             <property role="1pa3iD" value="44" />
-            <property role="2gRgW$" value="1771674007" />
+            <property role="2gRgW$" value="1560281086" />
           </node>
           <node concept="1pa3jb" id="2ynKV3ByXRq" role="1pap1a">
             <property role="1pa3iD" value="95" />
-            <property role="2gRgW$" value="1331809479" />
+            <property role="2gRgW$" value="834298155" />
           </node>
           <node concept="1pa3jb" id="2ynKV3ByXRr" role="1pap1a">
             <property role="1pa3iD" value="47" />
-            <property role="2gRgW$" value="1771674007" />
+            <property role="2gRgW$" value="1594621759" />
           </node>
         </node>
       </node>
       <node concept="37mRIm" id="5kIAo_xDU$W" role="37mRID">
         <property role="37mO49" value="6138012157480511548" />
         <node concept="gqqVs" id="5kIAo_xDU$V" role="37mO4d">
-          <property role="gqqTZ" value="300.0" />
-          <property role="gqqTW" value="542.8" />
+          <property role="gqqTZ" value="1096.0" />
+          <property role="gqqTW" value="342.8" />
           <property role="gqqTX" value="76.0" />
           <property role="gqqTy" value="50.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
@@ -3419,8 +3410,8 @@
         <node concept="gqqVs" id="5kIAo_xDUIi" role="37mO4d">
           <property role="gqqTX" value="76.0" />
           <property role="gqqTy" value="50.0" />
-          <property role="gqqTZ" value="12.0" />
-          <property role="gqqTW" value="542.8" />
+          <property role="gqqTZ" value="748.0" />
+          <property role="gqqTW" value="342.8" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="2ynKV3ByXRu" role="1pap1a">
             <property role="1pa3iD" value="target_port" />
@@ -3437,8 +3428,8 @@
         <node concept="gqqVs" id="5kIAo_xDUMr" role="37mO4d">
           <property role="gqqTX" value="76.0" />
           <property role="gqqTy" value="50.0" />
-          <property role="gqqTZ" value="204.0" />
-          <property role="gqqTW" value="542.8" />
+          <property role="gqqTZ" value="980.0" />
+          <property role="gqqTW" value="342.8" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="2ynKV3ByXRw" role="1pap1a">
             <property role="1pa3iD" value="target_port" />
@@ -3455,8 +3446,8 @@
         <node concept="gqqVs" id="5kIAo_xDUQB" role="37mO4d">
           <property role="gqqTX" value="76.0" />
           <property role="gqqTy" value="50.0" />
-          <property role="gqqTZ" value="396.0" />
-          <property role="gqqTW" value="542.8" />
+          <property role="gqqTZ" value="1212.0" />
+          <property role="gqqTW" value="342.8" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="2ynKV3ByXRy" role="1pap1a">
             <property role="1pa3iD" value="target_port" />
@@ -3473,8 +3464,8 @@
         <node concept="gqqVs" id="5kIAo_xDUUQ" role="37mO4d">
           <property role="gqqTX" value="76.0" />
           <property role="gqqTy" value="50.0" />
-          <property role="gqqTZ" value="492.0" />
-          <property role="gqqTW" value="542.8" />
+          <property role="gqqTZ" value="1328.0" />
+          <property role="gqqTW" value="342.8" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="2ynKV3ByXR$" role="1pap1a">
             <property role="1pa3iD" value="target_port" />
@@ -3491,8 +3482,8 @@
         <node concept="gqqVs" id="5kIAo_xDV1Q" role="37mO4d">
           <property role="gqqTX" value="76.0" />
           <property role="gqqTy" value="50.0" />
-          <property role="gqqTZ" value="780.0" />
-          <property role="gqqTW" value="542.8" />
+          <property role="gqqTZ" value="1676.0" />
+          <property role="gqqTW" value="342.8" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="2ynKV3ByXRA" role="1pap1a">
             <property role="1pa3iD" value="target_port" />
@@ -3509,8 +3500,8 @@
         <node concept="gqqVs" id="5kIAo_xDV6f" role="37mO4d">
           <property role="gqqTX" value="76.0" />
           <property role="gqqTy" value="50.0" />
-          <property role="gqqTZ" value="588.0" />
-          <property role="gqqTW" value="542.8" />
+          <property role="gqqTZ" value="1444.0" />
+          <property role="gqqTW" value="342.8" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="2ynKV3ByXRC" role="1pap1a">
             <property role="1pa3iD" value="target_port" />
@@ -3527,8 +3518,8 @@
         <node concept="gqqVs" id="5kIAo_xDVaF" role="37mO4d">
           <property role="gqqTX" value="76.0" />
           <property role="gqqTy" value="50.0" />
-          <property role="gqqTZ" value="684.0" />
-          <property role="gqqTW" value="542.8" />
+          <property role="gqqTZ" value="1560.0" />
+          <property role="gqqTW" value="342.8" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="2ynKV3ByXRE" role="1pap1a">
             <property role="1pa3iD" value="target_port" />
@@ -3545,8 +3536,8 @@
         <node concept="gqqVs" id="5kIAo_xDVfa" role="37mO4d">
           <property role="gqqTX" value="76.0" />
           <property role="gqqTy" value="50.0" />
-          <property role="gqqTZ" value="108.0" />
-          <property role="gqqTW" value="542.8" />
+          <property role="gqqTZ" value="864.0" />
+          <property role="gqqTW" value="342.8" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="2ynKV3ByXRG" role="1pap1a">
             <property role="1pa3iD" value="target_port" />
@@ -3563,16 +3554,16 @@
         <node concept="gqqVs" id="5kIAo_xF2uf" role="37mO4d">
           <property role="gqqTX" value="60.0" />
           <property role="gqqTy" value="50.0" />
-          <property role="gqqTZ" value="664.1385794691782" />
-          <property role="gqqTW" value="302.8" />
+          <property role="gqqTZ" value="216.0" />
+          <property role="gqqTW" value="222.8" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="2ynKV3ByXRI" role="1pap1a">
             <property role="1pa3iD" value="target_port" />
-            <property role="2gRgW$" value="713518759" />
+            <property role="2gRgW$" value="626926677" />
           </node>
           <node concept="1pa3jb" id="2ynKV3ByXRJ" role="1pap1a">
             <property role="1pa3iD" value="source_port" />
-            <property role="2gRgW$" value="1584901546" />
+            <property role="2gRgW$" value="1498309464" />
           </node>
         </node>
       </node>
@@ -3580,12 +3571,12 @@
         <property role="37mO49" value="5855146979799841590" />
         <node concept="2VclpC" id="2ynKV3ByXRU" role="37mO4d">
           <node concept="2VclrF" id="2ynKV3ByXRW" role="2Vcluh">
-            <property role="2Vclpx" value="662.9440207778522" />
-            <property role="2Vclpz" value="222.0" />
+            <property role="2Vclpx" value="330.125" />
+            <property role="2Vclpz" value="182.0" />
           </node>
           <node concept="2VclrF" id="2ynKV3ByXRX" role="2Vcluh">
-            <property role="2Vclpx" value="307.13857946917824" />
-            <property role="2Vclpz" value="222.0" />
+            <property role="2Vclpx" value="42.0" />
+            <property role="2Vclpz" value="182.0" />
           </node>
         </node>
       </node>
@@ -3593,11 +3584,11 @@
         <property role="37mO49" value="3731513482751673647" />
         <node concept="2VclpC" id="2ynKV3ByXRY" role="37mO4d">
           <node concept="2VclrF" id="2ynKV3ByXS0" role="2Vcluh">
-            <property role="2Vclpx" value="786.9102345647372" />
+            <property role="2Vclpx" value="755.5" />
             <property role="2Vclpz" value="82.0" />
           </node>
           <node concept="2VclrF" id="2ynKV3ByXS1" role="2Vcluh">
-            <property role="2Vclpx" value="671.0066267359155" />
+            <property role="2Vclpx" value="362.0" />
             <property role="2Vclpz" value="82.0" />
           </node>
         </node>
@@ -3606,11 +3597,11 @@
         <property role="37mO49" value="3731513482751673919" />
         <node concept="2VclpC" id="2ynKV3ByXS2" role="37mO4d">
           <node concept="2VclrF" id="2ynKV3ByXS4" role="2Vcluh">
-            <property role="2Vclpx" value="786.9102345647372" />
+            <property role="2Vclpx" value="755.5" />
             <property role="2Vclpz" value="82.0" />
           </node>
           <node concept="2VclrF" id="2ynKV3ByXS5" role="2Vcluh">
-            <property role="2Vclpx" value="578.0066267359155" />
+            <property role="2Vclpx" value="812.0" />
             <property role="2Vclpz" value="82.0" />
           </node>
         </node>
@@ -3619,12 +3610,12 @@
         <property role="37mO49" value="6138012157480512326" />
         <node concept="2VclpC" id="2ynKV3ByXS6" role="37mO4d">
           <node concept="2VclrF" id="2ynKV3ByXS8" role="2Vcluh">
-            <property role="2Vclpx" value="778.858847462453" />
-            <property role="2Vclpz" value="442.0" />
+            <property role="2Vclpx" value="1242.4468636090435" />
+            <property role="2Vclpz" value="322.0" />
           </node>
           <node concept="2VclrF" id="2ynKV3ByXS9" role="2Vcluh">
-            <property role="2Vclpx" value="339.0" />
-            <property role="2Vclpz" value="442.0" />
+            <property role="2Vclpx" value="1134.0" />
+            <property role="2Vclpz" value="322.0" />
           </node>
         </node>
       </node>
@@ -3632,12 +3623,8 @@
         <property role="37mO49" value="6138012157480513478" />
         <node concept="2VclpC" id="2ynKV3ByXSa" role="37mO4d">
           <node concept="2VclrF" id="2ynKV3ByXSc" role="2Vcluh">
-            <property role="2Vclpx" value="754.8403790774257" />
-            <property role="2Vclpz" value="382.0" />
-          </node>
-          <node concept="2VclrF" id="2ynKV3ByXSd" role="2Vcluh">
-            <property role="2Vclpx" value="51.0" />
-            <property role="2Vclpz" value="382.0" />
+            <property role="2Vclpx" value="786.0" />
+            <property role="2Vclpz" value="262.0" />
           </node>
         </node>
       </node>
@@ -3645,38 +3632,29 @@
         <property role="37mO49" value="6138012157480513520" />
         <node concept="2VclpC" id="2ynKV3ByXSe" role="37mO4d">
           <node concept="2VclrF" id="2ynKV3ByXSg" role="2Vcluh">
-            <property role="2Vclpx" value="770.8567606491763" />
-            <property role="2Vclpz" value="422.0" />
+            <property role="2Vclpx" value="1234.893727218087" />
+            <property role="2Vclpz" value="312.0" />
           </node>
           <node concept="2VclrF" id="2ynKV3ByXSh" role="2Vcluh">
-            <property role="2Vclpx" value="243.0" />
-            <property role="2Vclpz" value="422.0" />
+            <property role="2Vclpx" value="1018.0" />
+            <property role="2Vclpz" value="312.0" />
           </node>
         </node>
       </node>
       <node concept="37mRIm" id="2ynKV3ByXSj" role="37mRID">
         <property role="37mO49" value="6138012157480513563" />
-        <node concept="2VclpC" id="2ynKV3ByXSi" role="37mO4d">
-          <node concept="2VclrF" id="2ynKV3ByXSk" role="2Vcluh">
-            <property role="2Vclpx" value="786.8649503881904" />
-            <property role="2Vclpz" value="462.0" />
-          </node>
-          <node concept="2VclrF" id="2ynKV3ByXSl" role="2Vcluh">
-            <property role="2Vclpx" value="435.0" />
-            <property role="2Vclpz" value="462.0" />
-          </node>
-        </node>
+        <node concept="2VclpC" id="2ynKV3ByXSi" role="37mO4d" />
       </node>
       <node concept="37mRIm" id="2ynKV3ByXSn" role="37mRID">
         <property role="37mO49" value="6138012157480513607" />
         <node concept="2VclpC" id="2ynKV3ByXSm" role="37mO4d">
           <node concept="2VclrF" id="2ynKV3ByXSo" role="2Vcluh">
-            <property role="2Vclpx" value="794.9649503881905" />
-            <property role="2Vclpz" value="482.0" />
+            <property role="2Vclpx" value="1257.5531363909563" />
+            <property role="2Vclpz" value="322.0" />
           </node>
           <node concept="2VclrF" id="2ynKV3ByXSp" role="2Vcluh">
-            <property role="2Vclpx" value="531.0" />
-            <property role="2Vclpz" value="482.0" />
+            <property role="2Vclpx" value="1366.0" />
+            <property role="2Vclpz" value="322.0" />
           </node>
         </node>
       </node>
@@ -3684,12 +3662,12 @@
         <property role="37mO49" value="6138012157480514794" />
         <node concept="2VclpC" id="2ynKV3ByXSq" role="37mO4d">
           <node concept="2VclrF" id="2ynKV3ByXSs" role="2Vcluh">
-            <property role="2Vclpx" value="802.9710533139279" />
-            <property role="2Vclpz" value="502.0" />
+            <property role="2Vclpx" value="1265.106272781913" />
+            <property role="2Vclpz" value="312.0" />
           </node>
           <node concept="2VclrF" id="2ynKV3ByXSt" role="2Vcluh">
-            <property role="2Vclpx" value="627.0" />
-            <property role="2Vclpz" value="502.0" />
+            <property role="2Vclpx" value="1482.0" />
+            <property role="2Vclpz" value="312.0" />
           </node>
         </node>
       </node>
@@ -3697,12 +3675,12 @@
         <property role="37mO49" value="6138012157480514844" />
         <node concept="2VclpC" id="2ynKV3ByXSu" role="37mO4d">
           <node concept="2VclrF" id="2ynKV3ByXSw" role="2Vcluh">
-            <property role="2Vclpx" value="810.9811723521259" />
-            <property role="2Vclpz" value="522.0" />
+            <property role="2Vclpx" value="1272.6594091728693" />
+            <property role="2Vclpz" value="302.0" />
           </node>
-          <node concept="2VclrF" id="2ynKV3ByXSx" role="2Vcluh">
-            <property role="2Vclpx" value="723.0" />
-            <property role="2Vclpz" value="522.0" />
+          <node concept="2VclrF" id="3M596RFMTwO" role="2Vcluh">
+            <property role="2Vclpx" value="1598.0" />
+            <property role="2Vclpz" value="302.0" />
           </node>
         </node>
       </node>
@@ -3710,29 +3688,38 @@
         <property role="37mO49" value="6138012157480514895" />
         <node concept="2VclpC" id="2ynKV3ByXSy" role="37mO4d">
           <node concept="2VclrF" id="2ynKV3ByXS$" role="2Vcluh">
-            <property role="2Vclpx" value="762.8539974511447" />
-            <property role="2Vclpz" value="402.0" />
+            <property role="2Vclpx" value="1227.3405908271307" />
+            <property role="2Vclpz" value="302.0" />
           </node>
-          <node concept="2VclrF" id="2ynKV3ByXS_" role="2Vcluh">
-            <property role="2Vclpx" value="147.0" />
-            <property role="2Vclpz" value="402.0" />
+          <node concept="2VclrF" id="3M596RFMBve" role="2Vcluh">
+            <property role="2Vclpx" value="902.0" />
+            <property role="2Vclpz" value="302.0" />
           </node>
         </node>
       </node>
       <node concept="37mRIm" id="2ynKV3ByXSB" role="37mRID">
         <property role="37mO49" value="6138012157482271065" />
-        <node concept="2VclpC" id="2ynKV3ByXSA" role="37mO4d" />
+        <node concept="2VclpC" id="2ynKV3ByXSA" role="37mO4d">
+          <node concept="2VclrF" id="3M596RFMBuk" role="2Vcluh">
+            <property role="2Vclpx" value="351.375" />
+            <property role="2Vclpz" value="202.0" />
+          </node>
+          <node concept="2VclrF" id="3M596RFMBul" role="2Vcluh">
+            <property role="2Vclpx" value="246.0" />
+            <property role="2Vclpz" value="202.0" />
+          </node>
+        </node>
       </node>
       <node concept="37mRIm" id="2ynKV3ByXZR" role="37mRID">
         <property role="37mO49" value="5855146979799625276" />
         <node concept="2VclpC" id="2ynKV3ByXZQ" role="37mO4d">
           <node concept="2VclrF" id="2ynKV3ByXZS" role="2Vcluh">
-            <property role="2Vclpx" value="687.1057271962997" />
-            <property role="2Vclpz" value="282.0" />
+            <property role="2Vclpx" value="340.75" />
+            <property role="2Vclpz" value="192.0" />
           </node>
           <node concept="2VclrF" id="2ynKV3ByXZT" role="2Vcluh">
-            <property role="2Vclpx" value="613.1385794691782" />
-            <property role="2Vclpz" value="282.0" />
+            <property role="2Vclpx" value="144.0" />
+            <property role="2Vclpz" value="192.0" />
           </node>
         </node>
       </node>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._010_simple_examples.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._010_simple_examples.mps
index fe9adf067..27f62cfcd 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._010_simple_examples.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._010_simple_examples.mps
@@ -990,10 +990,10 @@
       <node concept="37mRIm" id="1qrXfdH0LFD" role="37mRID">
         <property role="37mO49" value="1629165016567716576" />
         <node concept="gqqVs" id="1qrXfdH0LFB" role="37mO4d">
-          <property role="gqqTZ" value="24.0" />
-          <property role="gqqTW" value="12.0" />
-          <property role="gqqTX" value="128.0" />
-          <property role="gqqTy" value="45.0" />
+          <property role="gqqTZ" value="33.0" />
+          <property role="gqqTW" value="12.000100000000003" />
+          <property role="gqqTX" value="100.0" />
+          <property role="gqqTy" value="42.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -1001,19 +1001,19 @@
         <property role="37mO49" value="1629165016567716597" />
         <node concept="gqqVs" id="1qrXfdH0LFX" role="37mO4d">
           <property role="gqqTZ" value="12.0" />
-          <property role="gqqTW" value="125.0" />
-          <property role="gqqTX" value="146.0" />
-          <property role="gqqTy" value="50.0" />
+          <property role="gqqTW" value="74.00029836425782" />
+          <property role="gqqTX" value="142.0" />
+          <property role="gqqTy" value="42.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
       <node concept="37mRIm" id="1qrXfdH0LGo" role="37mRID">
         <property role="37mO49" value="1629165016567716622" />
         <node concept="gqqVs" id="1qrXfdH0LGn" role="37mO4d">
-          <property role="gqqTZ" value="24.0" />
-          <property role="gqqTW" value="242.0" />
-          <property role="gqqTX" value="128.0" />
-          <property role="gqqTy" value="47.0" />
+          <property role="gqqTZ" value="30.0" />
+          <property role="gqqTW" value="136.00049672851563" />
+          <property role="gqqTX" value="106.0" />
+          <property role="gqqTy" value="42.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._500_gsn_doc.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._500_gsn_doc.mps
index 1b335bce2..ed6948d82 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._500_gsn_doc.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._500_gsn_doc.mps
@@ -13,7 +13,7 @@
   <registry>
     <language id="2dec0852-3a21-4c4e-a68c-b05236cc37f2" name="com.mbeddr.doc.gen_xhtml">
       <concept id="3350625596580275037" name="com.mbeddr.doc.gen_xhtml.structure.HTMLRenderer" flags="ng" index="1_07dB" />
-      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLDummyRenderer" flags="ng" index="1TaS0h" />
+      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLNoOutputRenderer" flags="ng" index="1TaS0h" />
     </language>
     <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.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 80d79798a..af19cdb4a 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
@@ -32,7 +32,7 @@
     <dependency reexport="false">215c4c45-ba99-49f5-9ab7-4b6901a63cfd(MPS.Generator)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1:de.slisson.mps.hacks.xmodelgen" version="0" />
+    <language slang="l:c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1:de.itemis.mps.hacks.xmodelgen" 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/solutions/com.mbeddr.formal.safety.gsn.web.rt/models/com.mbeddr.formal.safety.gsn.web.rt.gsn_genplan.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/models/com.mbeddr.formal.safety.gsn.web.rt.gsn_genplan.mps
index b99fa2ae1..e2e3ff164 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/models/com.mbeddr.formal.safety.gsn.web.rt.gsn_genplan.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/models/com.mbeddr.formal.safety.gsn.web.rt.gsn_genplan.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan" version="1" />
-    <use id="c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1" name="de.slisson.mps.hacks.xmodelgen" version="0" />
+    <use id="c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1" name="de.itemis.mps.hacks.xmodelgen" version="0" />
   </languages>
   <imports>
     <import index="hbry" ref="r:bf658a5c-3bda-4f96-8dda-0c8202ea6196(com.mbeddr.formal.safety.gsn.web.templates@generator)" />
@@ -17,12 +17,12 @@
         <child id="2944629966652439181" name="languages" index="1t_9vn" />
       </concept>
     </language>
-    <language id="c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1" name="de.slisson.mps.hacks.xmodelgen">
-      <concept id="961590472824346305" name="de.slisson.mps.hacks.xmodelgen.structure.MappingConfigStep" flags="ng" index="2Pg1uL">
+    <language id="c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1" name="de.itemis.mps.hacks.xmodelgen">
+      <concept id="961590472824346305" name="de.itemis.mps.hacks.xmodelgen.structure.MappingConfigStep" flags="ng" index="2Pg1uL">
         <child id="7786846688815598697" name="mappingConfigurations" index="3VlUeB" />
       </concept>
-      <concept id="961590472824361214" name="de.slisson.mps.hacks.xmodelgen.structure.MCListLanguageIdentity" flags="ng" index="2Pgd6e" />
-      <concept id="7786846688815408482" name="de.slisson.mps.hacks.xmodelgen.structure.MappingConfigurationReference" flags="ng" index="3Vl8EG">
+      <concept id="961590472824361214" name="de.itemis.mps.hacks.xmodelgen.structure.MCListLanguageIdentity" flags="ng" index="2Pgd6e" />
+      <concept id="7786846688815408482" name="de.itemis.mps.hacks.xmodelgen.structure.MappingConfigurationReference" flags="ng" index="3Vl8EG">
         <reference id="7786846688815408483" name="mc" index="3Vl8EH" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/generator/template/main@generator.mps b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/generator/template/main@generator.mps
index 26634dac9..55ac2c1f8 100644
--- a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/generator/template/main@generator.mps
@@ -300,7 +300,7 @@
             <node concept="1Uau1d" id="1MFSGJpnCLg" role="11AoXW">
               <node concept="1UfkGm" id="1MFSGJpnCLr" role="1UfoCz">
                 <node concept="11ACyy" id="1MFSGJpnCLE" role="1U5zfR">
-                  <ref role="11ACyx" node="1MFSGJpnCKu" />
+                  <ref role="11ACyx" node="1MFSGJpnCKu" resolve="a" />
                   <node concept="1ZhdrF" id="1MFSGJpod9R" role="lGtFl">
                     <property role="P3scX" value="9e54e509-552a-4f20-9b96-12a273367cff/7139183404079772121/7139183404079772122" />
                     <property role="2qtEX8" value="var" />
@@ -364,7 +364,7 @@
               </node>
               <node concept="1UfkGm" id="1MFSGJpnCLP" role="1UfoCz">
                 <node concept="11ACyy" id="1MFSGJpnCM7" role="1U5zfR">
-                  <ref role="11ACyx" node="1MFSGJpnCKI" />
+                  <ref role="11ACyx" node="1MFSGJpnCKI" resolve="b" />
                   <node concept="1ZhdrF" id="1MFSGJpoH0y" role="lGtFl">
                     <property role="P3scX" value="9e54e509-552a-4f20-9b96-12a273367cff/7139183404079772121/7139183404079772122" />
                     <property role="2qtEX8" value="var" />
@@ -878,9 +878,9 @@
               <node concept="1UfpLS" id="1MFSGJppwk4" role="11ARNb">
                 <node concept="1Uau1c" id="1MFSGJppwkn" role="1U5zfR">
                   <node concept="11BOot" id="1MFSGJppwmG" role="1UfoCz">
-                    <ref role="11BOos" node="1MFSGJppwlc" />
+                    <ref role="11BOos" node="1MFSGJppwlc" resolve="test_fun" />
                     <node concept="11ACyy" id="1MFSGJppwno" role="11yxzb">
-                      <ref role="11ACyx" node="1MFSGJppwiW" />
+                      <ref role="11ACyx" node="1MFSGJppwiW" resolve="a" />
                       <node concept="1WS0z7" id="1MFSGJppN5b" role="lGtFl">
                         <node concept="3JmXsc" id="1MFSGJppN5c" role="3Jn$fo">
                           <node concept="3clFbS" id="1MFSGJppN5d" role="2VODD2">
@@ -920,7 +920,7 @@
                       </node>
                     </node>
                     <node concept="11ACyy" id="1MFSGJprOHd" role="11yxzb">
-                      <ref role="11ACyx" node="1MFSGJppwjk" />
+                      <ref role="11ACyx" node="1MFSGJppwjk" resolve="b" />
                       <node concept="1WS0z7" id="1MFSGJprOHe" role="lGtFl">
                         <node concept="3JmXsc" id="1MFSGJprOHf" role="3Jn$fo">
                           <node concept="3clFbS" id="1MFSGJprOHg" role="2VODD2">
@@ -1009,7 +1009,7 @@
                 <node concept="11BOot" id="1MFSGJppQH3" role="1U5zfT">
                   <ref role="11BOos" node="1MFSGJppwh1" />
                   <node concept="11ACyy" id="1MFSGJpqJWC" role="11yxzb">
-                    <ref role="11ACyx" node="1MFSGJppwiW" />
+                    <ref role="11ACyx" node="1MFSGJppwiW" resolve="a" />
                     <node concept="1WS0z7" id="1MFSGJpqJWD" role="lGtFl">
                       <node concept="3JmXsc" id="1MFSGJpqJWE" role="3Jn$fo">
                         <node concept="3clFbS" id="1MFSGJpqJWF" role="2VODD2">
@@ -1049,7 +1049,7 @@
                     </node>
                   </node>
                   <node concept="11ACyy" id="1MFSGJprGfX" role="11yxzb">
-                    <ref role="11ACyx" node="1MFSGJppwjk" />
+                    <ref role="11ACyx" node="1MFSGJppwjk" resolve="b" />
                     <node concept="1WS0z7" id="1MFSGJprGz1" role="lGtFl">
                       <node concept="3JmXsc" id="1MFSGJprGz2" role="3Jn$fo">
                         <node concept="3clFbS" id="1MFSGJprGz3" role="2VODD2">
diff --git a/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/_010_simple_output.mps b/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/_010_simple_output.mps
index 14f0e669d..a141048c6 100644
--- a/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/_010_simple_output.mps
+++ b/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/_010_simple_output.mps
@@ -79,22 +79,22 @@
         </node>
         <node concept="35L7W5" id="3908G2fy9iO" role="1U5zfT">
           <node concept="1U5_Ed" id="3908G2fy9iH" role="35L7Wp">
-            <ref role="1U5_Ec" node="3908G2fy9iF" />
+            <ref role="1U5_Ec" node="3908G2fy9iF" resolve="terminal_4" />
           </node>
           <node concept="1UfqsA" id="3908G2fy9iI" role="35L7Wu">
             <node concept="1U5_Ed" id="3908G2fy9iJ" role="1UfoCz">
-              <ref role="1U5_Ec" node="3908G2fy9ir" />
+              <ref role="1U5_Ec" node="3908G2fy9ir" resolve="terminal_0" />
             </node>
             <node concept="1U5_Ed" id="3908G2fy9iK" role="1UfoCz">
-              <ref role="1U5_Ec" node="3908G2fy9iv" />
+              <ref role="1U5_Ec" node="3908G2fy9iv" resolve="terminal_1" />
             </node>
           </node>
           <node concept="1UfqsD" id="3908G2fy9iL" role="35L7Wh">
             <node concept="1U5_Ed" id="3908G2fy9iM" role="1U5zfR">
-              <ref role="1U5_Ec" node="3908G2fy9iz" />
+              <ref role="1U5_Ec" node="3908G2fy9iz" resolve="terminal_2" />
             </node>
             <node concept="1U5_Ed" id="3908G2fy9iN" role="1U5zfT">
-              <ref role="1U5_Ec" node="3908G2fy9iB" />
+              <ref role="1U5_Ec" node="3908G2fy9iB" resolve="terminal_3" />
             </node>
           </node>
         </node>
diff --git a/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/sandbox._010_smoke_synth.mps b/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/sandbox._010_smoke_synth.mps
index 750e3d107..b05c19999 100644
--- a/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/sandbox._010_smoke_synth.mps
+++ b/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/sandbox._010_smoke_synth.mps
@@ -135,14 +135,14 @@
       <node concept="1U5apb" id="1MFSGJprTJ3" role="11zN3m" />
       <node concept="1UfkGm" id="1MFSGJppp7h" role="11AoXW">
         <node concept="11ACyy" id="1MFSGJprFo4" role="1U5zfR">
-          <ref role="11ACyx" node="1MFSGJpr2Cl" />
+          <ref role="11ACyx" node="1MFSGJpr2Cl" resolve="b" />
         </node>
         <node concept="1UfqsA" id="1MFSGJppp7j" role="1U5zfT">
           <node concept="11ACyy" id="1MFSGJprFo9" role="1UfoCz">
-            <ref role="11ACyx" node="1MFSGJpr2C5" />
+            <ref role="11ACyx" node="1MFSGJpr2C5" resolve="a" />
           </node>
           <node concept="1U5_Ed" id="1MFSGJppp7l" role="1UfoCz">
-            <ref role="1U5_Ec" node="104dc5EbthM" />
+            <ref role="1U5_Ec" node="104dc5EbthM" resolve="GAP" />
           </node>
         </node>
       </node>
@@ -169,14 +169,14 @@
       </node>
       <node concept="1UfkGm" id="7xXCuh1D$pe" role="11AoXW">
         <node concept="11ACyy" id="7xXCuh1EkE4" role="1U5zfR">
-          <ref role="11ACyx" node="7xXCuh1EkDB" />
+          <ref role="11ACyx" node="7xXCuh1EkDB" resolve="b1" />
         </node>
         <node concept="1UfqsA" id="7xXCuh1D$p_" role="1U5zfT">
           <node concept="11ACyy" id="7xXCuh1EkDX" role="1UfoCz">
-            <ref role="11ACyx" node="7xXCuh1EkDn" />
+            <ref role="11ACyx" node="7xXCuh1EkDn" resolve="a1" />
           </node>
           <node concept="1U5_Ed" id="7xXCuh1D$pB" role="1UfoCz">
-            <ref role="1U5_Ec" node="6cjunGyyaJ9" />
+            <ref role="1U5_Ec" node="6cjunGyyaJ9" resolve="GAP" />
           </node>
         </node>
       </node>
@@ -197,7 +197,7 @@
       <node concept="1Uau1d" id="1MFSGJp8vhR" role="11AoXW">
         <node concept="1UfkGm" id="1MFSGJp8vib" role="1UfoCz">
           <node concept="11ACyy" id="1MFSGJp8viw" role="1U5zfR">
-            <ref role="11ACyx" node="7xXCuh1EkAz" />
+            <ref role="11ACyx" node="7xXCuh1EkAz" resolve="a2" />
           </node>
           <node concept="2IPVmt" id="1MFSGJp8vid" role="1U5zfT">
             <property role="2IPVms" value="2" />
@@ -208,7 +208,7 @@
             <property role="2IPVms" value="3" />
           </node>
           <node concept="11ACyy" id="1MFSGJp8viB" role="1U5zfR">
-            <ref role="11ACyx" node="7xXCuh1EkAN" />
+            <ref role="11ACyx" node="7xXCuh1EkAN" resolve="b2" />
           </node>
         </node>
       </node>
@@ -227,7 +227,7 @@
       <node concept="1Uau1d" id="1MFSGJp8viF" role="11AoXW">
         <node concept="1UfkGm" id="1MFSGJp8viG" role="1UfoCz">
           <node concept="11ACyy" id="1MFSGJp8vj3" role="1U5zfR">
-            <ref role="11ACyx" node="1MFSGJp8vcD" />
+            <ref role="11ACyx" node="1MFSGJp8vcD" resolve="a3" />
           </node>
           <node concept="2IPVmt" id="1MFSGJp8viI" role="1U5zfT">
             <property role="2IPVms" value="3" />
@@ -238,7 +238,7 @@
             <property role="2IPVms" value="4" />
           </node>
           <node concept="11ACyy" id="1MFSGJp8vja" role="1U5zfR">
-            <ref role="11ACyx" node="1MFSGJp8vcF" />
+            <ref role="11ACyx" node="1MFSGJp8vcF" resolve="b3" />
           </node>
         </node>
       </node>
@@ -257,7 +257,7 @@
       <node concept="1Uau1d" id="1MFSGJp8vjh" role="11AoXW">
         <node concept="1UfkGm" id="1MFSGJp8vji" role="1UfoCz">
           <node concept="11ACyy" id="1MFSGJp8vjD" role="1U5zfR">
-            <ref role="11ACyx" node="1MFSGJp8veZ" />
+            <ref role="11ACyx" node="1MFSGJp8veZ" resolve="a4" />
           </node>
           <node concept="2IPVmt" id="1MFSGJp8vjk" role="1U5zfT">
             <property role="2IPVms" value="4" />
@@ -268,7 +268,7 @@
             <property role="2IPVms" value="15" />
           </node>
           <node concept="11ACyy" id="1MFSGJp8vjK" role="1U5zfR">
-            <ref role="11ACyx" node="1MFSGJp8vf1" />
+            <ref role="11ACyx" node="1MFSGJp8vf1" resolve="b4" />
           </node>
         </node>
       </node>
@@ -286,40 +286,40 @@
         </node>
         <node concept="1UfpLS" id="6cjunGyyEVo" role="11ARNb">
           <node concept="11BOot" id="6cjunGyzgZl" role="1U5zfT">
-            <ref role="11BOos" node="7xXCuh1D$mP" />
+            <ref role="11BOos" node="7xXCuh1D$mP" resolve="initialFormula" />
             <node concept="11ACyy" id="7xXCuh1EkGo" role="11yxzb">
-              <ref role="11ACyx" node="6cjunGyyaLA" />
+              <ref role="11ACyx" node="6cjunGyyaLA" resolve="a" />
             </node>
             <node concept="11ACyy" id="7xXCuh1EkGz" role="11yxzb">
-              <ref role="11ACyx" node="6cjunGyyaLY" />
+              <ref role="11ACyx" node="6cjunGyyaLY" resolve="b" />
             </node>
           </node>
           <node concept="1Uau1c" id="1MFSGJp8vjV" role="1U5zfR">
             <node concept="11BOot" id="1MFSGJp8vkz" role="1UfoCz">
-              <ref role="11BOos" node="7xXCuh1D$vh" />
+              <ref role="11BOos" node="7xXCuh1D$vh" resolve="t1" />
               <node concept="11ACyy" id="1MFSGJp8vkY" role="11yxzb">
-                <ref role="11ACyx" node="6cjunGyyaLA" />
+                <ref role="11ACyx" node="6cjunGyyaLA" resolve="a" />
               </node>
               <node concept="11ACyy" id="1MFSGJp8vl9" role="11yxzb">
-                <ref role="11ACyx" node="6cjunGyyaLY" />
+                <ref role="11ACyx" node="6cjunGyyaLY" resolve="b" />
               </node>
             </node>
             <node concept="11BOot" id="1MFSGJp8vlf" role="1UfoCz">
-              <ref role="11BOos" node="1MFSGJp8vcC" />
+              <ref role="11BOos" node="1MFSGJp8vcC" resolve="t2" />
               <node concept="11ACyy" id="1MFSGJp8vlg" role="11yxzb">
-                <ref role="11ACyx" node="6cjunGyyaLA" />
+                <ref role="11ACyx" node="6cjunGyyaLA" resolve="a" />
               </node>
               <node concept="11ACyy" id="1MFSGJp8vlh" role="11yxzb">
-                <ref role="11ACyx" node="6cjunGyyaLY" />
+                <ref role="11ACyx" node="6cjunGyyaLY" resolve="b" />
               </node>
             </node>
             <node concept="11BOot" id="1MFSGJp8vlu" role="1UfoCz">
-              <ref role="11BOos" node="1MFSGJp8veY" />
+              <ref role="11BOos" node="1MFSGJp8veY" resolve="t3" />
               <node concept="11ACyy" id="1MFSGJp8vlv" role="11yxzb">
-                <ref role="11ACyx" node="6cjunGyyaLA" />
+                <ref role="11ACyx" node="6cjunGyyaLA" resolve="a" />
               </node>
               <node concept="11ACyy" id="1MFSGJp8vlw" role="11yxzb">
-                <ref role="11ACyx" node="6cjunGyyaLY" />
+                <ref role="11ACyx" node="6cjunGyyaLY" resolve="b" />
               </node>
             </node>
           </node>
@@ -379,11 +379,11 @@
       <node concept="1U5apb" id="1MFSGJprTPN" role="11zN3m" />
       <node concept="1UfkGm" id="1MFSGJprTPO" role="11AoXW">
         <node concept="11ACyy" id="1MFSGJprTPP" role="1U5zfR">
-          <ref role="11ACyx" node="1MFSGJprTPL" />
+          <ref role="11ACyx" node="1MFSGJprTPL" resolve="b" />
         </node>
         <node concept="1UfqsA" id="1MFSGJprTPQ" role="1U5zfT">
           <node concept="11ACyy" id="1MFSGJprTPR" role="1UfoCz">
-            <ref role="11ACyx" node="1MFSGJprTPJ" />
+            <ref role="11ACyx" node="1MFSGJprTPJ" resolve="a" />
           </node>
           <node concept="1UbFQc" id="1MFSGJprTQe" role="1UfoCz" />
         </node>
diff --git a/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib/models/_010_smoke.mps b/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib/models/_010_smoke.mps
index 81224ab82..c890d117d 100644
--- a/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib/models/_010_smoke.mps
+++ b/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib/models/_010_smoke.mps
@@ -122,7 +122,7 @@
     <node concept="1U56EO" id="104dc5E4ctq" role="1U2RmC">
       <node concept="1U5ao_" id="104dc5E4zQ4" role="1U56ET">
         <node concept="1U5_Ed" id="104dc5E4Is4" role="1U5zfR">
-          <ref role="1U5_Ec" node="104dc5E499u" />
+          <ref role="1U5_Ec" node="104dc5E499u" resolve="aDeclaredConst" />
         </node>
         <node concept="2IPVmt" id="104dc5E4Isb" role="1U5zfT">
           <property role="2IPVms" value="9" />
@@ -132,7 +132,7 @@
     <node concept="1U56EO" id="104dc5E6un_" role="1U2RmC">
       <node concept="1U4LMg" id="104dc5E6uo4" role="1U56ET">
         <node concept="1U5_Ed" id="104dc5E6uoi" role="1U5zfR">
-          <ref role="1U5_Ec" node="104dc5E499u" />
+          <ref role="1U5_Ec" node="104dc5E499u" resolve="aDeclaredConst" />
         </node>
         <node concept="2IPVmt" id="104dc5E6uoq" role="1U5zfT">
           <property role="2IPVms" value="8" />
@@ -150,11 +150,11 @@
     <node concept="1U56EO" id="4tZ7POS58mr" role="1U2RmC">
       <node concept="35L7W5" id="4tZ7POS58n9" role="1U56ET">
         <node concept="1U5_Ed" id="4tZ7POS58nx" role="35L7Wp">
-          <ref role="1U5_Ec" node="4tZ7POS58lF" />
+          <ref role="1U5_Ec" node="4tZ7POS58lF" resolve="iteCond" />
         </node>
         <node concept="1UfkGm" id="4tZ7POS58nC" role="35L7Wu">
           <node concept="1U5_Ed" id="4tZ7POS58nU" role="1U5zfR">
-            <ref role="1U5_Ec" node="104dc5E499u" />
+            <ref role="1U5_Ec" node="104dc5E499u" resolve="aDeclaredConst" />
           </node>
           <node concept="2IPVmt" id="4tZ7POS58o2" role="1U5zfT">
             <property role="2IPVms" value="8" />
@@ -179,7 +179,7 @@
       <node concept="1U5aqE" id="6cjunGyBWnw" role="11zN3m" />
       <node concept="1UfqsA" id="6cjunGyCXa_" role="11AoXW">
         <node concept="11ACyy" id="6cjunGyCXaN" role="1UfoCz">
-          <ref role="11ACyx" node="6cjunGyBWng" />
+          <ref role="11ACyx" node="6cjunGyBWng" resolve="par1" />
         </node>
         <node concept="2IPVmt" id="6cjunGyCXb0" role="1UfoCz">
           <property role="2IPVms" value="1" />
@@ -193,9 +193,9 @@
     <node concept="1U56EO" id="6cjunGyBWm9" role="1U2RmC">
       <node concept="1UfkGm" id="6cjunGyBWqy" role="1U56ET">
         <node concept="11BOot" id="6cjunGyBWqL" role="1U5zfR">
-          <ref role="11BOos" node="6cjunGyBWmI" />
+          <ref role="11BOos" node="6cjunGyBWmI" resolve="foo" />
           <node concept="1U5_Ed" id="6cjunGyBWqX" role="11yxzb">
-            <ref role="1U5_Ec" node="6cjunGyBWm2" />
+            <ref role="1U5_Ec" node="6cjunGyBWm2" resolve="aConst" />
           </node>
         </node>
         <node concept="2IPVmt" id="6cjunGyBWmc" role="1U5zfT">
@@ -222,9 +222,9 @@
     <node concept="1U56EO" id="2l5A0OF1WWq" role="1U2RmC">
       <node concept="1UfkGm" id="2l5A0OF1WWr" role="1U56ET">
         <node concept="11BOot" id="2l5A0OF1WWs" role="1U5zfR">
-          <ref role="11BOos" node="2l5A0OF1WXc" />
+          <ref role="11BOos" node="2l5A0OF1WXc" resolve="foo" />
           <node concept="1U5_Ed" id="2l5A0OF1WWt" role="11yxzb">
-            <ref role="1U5_Ec" node="2l5A0OF1WWo" />
+            <ref role="1U5_Ec" node="2l5A0OF1WWo" resolve="aConst" />
           </node>
         </node>
         <node concept="2IPVmt" id="2l5A0OF1WWu" role="1U5zfT">
@@ -251,13 +251,13 @@
     <node concept="1U56EO" id="2l5A0OF69o0" role="1U2RmC">
       <node concept="1UfkGm" id="2l5A0OF69o1" role="1U56ET">
         <node concept="11BOot" id="2l5A0OF69o2" role="1U5zfR">
-          <ref role="11BOos" node="2l5A0OF69nT" />
+          <ref role="11BOos" node="2l5A0OF69nT" resolve="foo" />
           <node concept="1U5_Ed" id="2l5A0OF69o3" role="11yxzb">
-            <ref role="1U5_Ec" node="2l5A0OF69nX" />
+            <ref role="1U5_Ec" node="2l5A0OF69nX" resolve="aConst" />
           </node>
         </node>
         <node concept="1U5_Ed" id="2l5A0OF69om" role="1U5zfT">
-          <ref role="1U5_Ec" node="2l5A0OF69nX" />
+          <ref role="1U5_Ec" node="2l5A0OF69nX" resolve="aConst" />
         </node>
       </node>
     </node>
@@ -276,7 +276,7 @@
           <node concept="engXH" id="2_LXzlpuXeU" role="engYz">
             <property role="TrG5h" value="pred" />
             <node concept="mKvrX" id="6MrCApUnpto" role="engXD">
-              <ref role="mKvtK" node="2l5A0OF6OA6" />
+              <ref role="mKvtK" node="2l5A0OF6OA6" resolve="Nat" />
             </node>
           </node>
         </node>
@@ -286,14 +286,14 @@
       <property role="TrG5h" value="p" />
       <node concept="1U5apb" id="6MrCApUnpuB" role="1U56Ci" />
       <node concept="mKvrX" id="6MrCApUnpux" role="1U56Cg">
-        <ref role="mKvtK" node="2l5A0OF6OA6" />
+        <ref role="mKvtK" node="2l5A0OF6OA6" resolve="Nat" />
       </node>
     </node>
     <node concept="1U56EO" id="6MrCApUnpvh" role="1U2RmC">
       <node concept="11BOot" id="6MrCApUnpw7" role="1U56ET">
-        <ref role="11BOos" node="6MrCApUnptW" />
+        <ref role="11BOos" node="6MrCApUnptW" resolve="p" />
         <node concept="mYNaY" id="6MrCApUpU$s" role="11yxzb">
-          <ref role="mYNcP" node="2l5A0OF6PZv" />
+          <ref role="mYNcP" node="2l5A0OF6PZv" resolve="zero" />
         </node>
       </node>
     </node>
@@ -302,23 +302,23 @@
         <node concept="11ARNU" id="6MrCApUpU_Z" role="11ARNT">
           <property role="TrG5h" value="x" />
           <node concept="mKvrX" id="6MrCApUpUAg" role="11ARNN">
-            <ref role="mKvtK" node="2l5A0OF6OA6" />
+            <ref role="mKvtK" node="2l5A0OF6OA6" resolve="Nat" />
           </node>
         </node>
         <node concept="1UfpLS" id="6MrCApUpUAw" role="11ARNb">
           <node concept="11BOot" id="6MrCApUpUAI" role="1U5zfR">
-            <ref role="11BOos" node="6MrCApUnptW" />
+            <ref role="11BOos" node="6MrCApUnptW" resolve="p" />
             <node concept="mZ0x0" id="6MrCApUqOlf" role="11yxzb">
-              <ref role="mZ0z7" node="2_LXzlpuXeU" />
+              <ref role="mZ0z7" node="2_LXzlpuXeU" resolve="pred" />
               <node concept="11ACyy" id="7xXCuh1D$hA" role="mWesK">
-                <ref role="11ACyx" node="6MrCApUpU_Z" />
+                <ref role="11ACyx" node="6MrCApUpU_Z" resolve="x" />
               </node>
             </node>
           </node>
           <node concept="11BOot" id="6MrCApUrQjO" role="1U5zfT">
-            <ref role="11BOos" node="6MrCApUnptW" />
+            <ref role="11BOos" node="6MrCApUnptW" resolve="p" />
             <node concept="11ACyy" id="6MrCApUrQk2" role="11yxzb">
-              <ref role="11ACyx" node="6MrCApUpU_Z" />
+              <ref role="11ACyx" node="6MrCApUpU_Z" resolve="x" />
             </node>
           </node>
         </node>
@@ -330,13 +330,13 @@
           <node concept="11ARNU" id="6MrCApUrQmt" role="11ARNT">
             <property role="TrG5h" value="x" />
             <node concept="mKvrX" id="6MrCApUrQmI" role="11ARNN">
-              <ref role="mKvtK" node="2l5A0OF6OA6" />
+              <ref role="mKvtK" node="2l5A0OF6OA6" resolve="Nat" />
             </node>
           </node>
           <node concept="11BOot" id="6MrCApUrQn5" role="11ARNb">
-            <ref role="11BOos" node="6MrCApUnptW" />
+            <ref role="11BOos" node="6MrCApUnptW" resolve="p" />
             <node concept="11ACyy" id="1MFSGJpf4Dr" role="11yxzb">
-              <ref role="11ACyx" node="6MrCApUrQmt" />
+              <ref role="11ACyx" node="6MrCApUrQmt" resolve="x" />
             </node>
           </node>
         </node>
@@ -359,17 +359,17 @@
       <node concept="1U5aqE" id="1MFSGJpcpGc" role="11zN3m" />
       <node concept="1UfqsA" id="1MFSGJpcpGd" role="11AoXW">
         <node concept="11ACyy" id="1MFSGJpcpGe" role="1UfoCz">
-          <ref role="11ACyx" node="1MFSGJpcpGa" />
+          <ref role="11ACyx" node="1MFSGJpcpGa" resolve="par1" />
         </node>
         <node concept="11ACyy" id="1MFSGJpcpHD" role="1UfoCz">
-          <ref role="11ACyx" node="1MFSGJpcpH5" />
+          <ref role="11ACyx" node="1MFSGJpcpH5" resolve="par2" />
         </node>
       </node>
     </node>
     <node concept="1U56EO" id="1MFSGJpcpGk" role="1U2RmC">
       <node concept="1UfkGm" id="1MFSGJpcpGl" role="1U56ET">
         <node concept="11BOot" id="1MFSGJpcpGm" role="1U5zfR">
-          <ref role="11BOos" node="1MFSGJpcpG9" />
+          <ref role="11BOos" node="1MFSGJpcpG9" resolve="add" />
           <node concept="2IPVmt" id="1MFSGJpcpIk" role="11yxzb">
             <property role="2IPVms" value="1" />
           </node>
@@ -399,13 +399,13 @@
         </node>
         <node concept="1UfkGm" id="1MFSGJpdnnj" role="11ARNb">
           <node concept="11BOot" id="1MFSGJpdnnk" role="1U5zfR">
-            <ref role="11BOos" node="1MFSGJpdnnb" />
+            <ref role="11BOos" node="1MFSGJpdnnb" resolve="foo" />
             <node concept="11ACyy" id="1MFSGJpdnoM" role="11yxzb">
-              <ref role="11ACyx" node="1MFSGJpdno4" />
+              <ref role="11ACyx" node="1MFSGJpdno4" resolve="p" />
             </node>
           </node>
           <node concept="11ACyy" id="7vEzmJ3BNV$" role="1U5zfT">
-            <ref role="11ACyx" node="1MFSGJpdno4" />
+            <ref role="11ACyx" node="1MFSGJpdno4" resolve="p" />
           </node>
         </node>
       </node>
@@ -432,31 +432,31 @@
     <node concept="1U2Rm_" id="2FrZhHbXF9T" role="1U2RmC">
       <property role="TrG5h" value="x" />
       <node concept="mKvrX" id="2FrZhHbXFa9" role="1U56Fq">
-        <ref role="mKvtK" node="2FrZhHbXF9d" />
+        <ref role="mKvtK" node="2FrZhHbXF9d" resolve="Enum" />
       </node>
     </node>
     <node concept="1U2Rm_" id="2FrZhHbXFaf" role="1U2RmC">
       <property role="TrG5h" value="y" />
       <node concept="mKvrX" id="2FrZhHbXFag" role="1U56Fq">
-        <ref role="mKvtK" node="2FrZhHbXF9d" />
+        <ref role="mKvtK" node="2FrZhHbXF9d" resolve="Enum" />
       </node>
     </node>
     <node concept="1U2Rm_" id="2FrZhHbXFav" role="1U2RmC">
       <property role="TrG5h" value="z" />
       <node concept="mKvrX" id="2FrZhHbXFaw" role="1U56Fq">
-        <ref role="mKvtK" node="2FrZhHbXF9d" />
+        <ref role="mKvtK" node="2FrZhHbXF9d" resolve="Enum" />
       </node>
     </node>
     <node concept="1U56EO" id="2FrZhHbXFb0" role="1U2RmC">
       <node concept="1xbkZQ" id="2FrZhHbYMgD" role="1U56ET">
         <node concept="1U5_Ed" id="2FrZhHbYMgN" role="1UfoCz">
-          <ref role="1U5_Ec" node="2FrZhHbXF9T" />
+          <ref role="1U5_Ec" node="2FrZhHbXF9T" resolve="x" />
         </node>
         <node concept="1U5_Ed" id="2FrZhHbYMgV" role="1UfoCz">
-          <ref role="1U5_Ec" node="2FrZhHbXFaf" />
+          <ref role="1U5_Ec" node="2FrZhHbXFaf" resolve="y" />
         </node>
         <node concept="1U5_Ed" id="2FrZhHbYMh7" role="1UfoCz">
-          <ref role="1U5_Ec" node="2FrZhHbXFav" />
+          <ref role="1U5_Ec" node="2FrZhHbXFav" resolve="z" />
         </node>
       </node>
     </node>
@@ -482,40 +482,40 @@
     <node concept="1U2Rm_" id="2FrZhHc0DBX" role="1U2RmC">
       <property role="TrG5h" value="x" />
       <node concept="mKvrX" id="2FrZhHc0DBY" role="1U56Fq">
-        <ref role="mKvtK" node="2FrZhHc0DBT" />
+        <ref role="mKvtK" node="2FrZhHc0DBT" resolve="Enum" />
       </node>
     </node>
     <node concept="1U2Rm_" id="2FrZhHc0DBZ" role="1U2RmC">
       <property role="TrG5h" value="y" />
       <node concept="mKvrX" id="2FrZhHc0DC0" role="1U56Fq">
-        <ref role="mKvtK" node="2FrZhHc0DBT" />
+        <ref role="mKvtK" node="2FrZhHc0DBT" resolve="Enum" />
       </node>
     </node>
     <node concept="1U2Rm_" id="2FrZhHc0DC1" role="1U2RmC">
       <property role="TrG5h" value="z" />
       <node concept="mKvrX" id="2FrZhHc0DC2" role="1U56Fq">
-        <ref role="mKvtK" node="2FrZhHc0DBT" />
+        <ref role="mKvtK" node="2FrZhHc0DBT" resolve="Enum" />
       </node>
     </node>
     <node concept="1U2Rm_" id="2FrZhHc0DC3" role="1U2RmC">
       <property role="TrG5h" value="w" />
       <node concept="mKvrX" id="2FrZhHc0DC4" role="1U56Fq">
-        <ref role="mKvtK" node="2FrZhHc0DBT" />
+        <ref role="mKvtK" node="2FrZhHc0DBT" resolve="Enum" />
       </node>
     </node>
     <node concept="1U56EO" id="2FrZhHc0DC5" role="1U2RmC">
       <node concept="1xbkZQ" id="2FrZhHc0DC6" role="1U56ET">
         <node concept="1U5_Ed" id="2FrZhHc0DC7" role="1UfoCz">
-          <ref role="1U5_Ec" node="2FrZhHc0DBX" />
+          <ref role="1U5_Ec" node="2FrZhHc0DBX" resolve="x" />
         </node>
         <node concept="1U5_Ed" id="2FrZhHc0DC8" role="1UfoCz">
-          <ref role="1U5_Ec" node="2FrZhHc0DBZ" />
+          <ref role="1U5_Ec" node="2FrZhHc0DBZ" resolve="y" />
         </node>
         <node concept="1U5_Ed" id="2FrZhHc0DC9" role="1UfoCz">
-          <ref role="1U5_Ec" node="2FrZhHc0DC1" />
+          <ref role="1U5_Ec" node="2FrZhHc0DC1" resolve="z" />
         </node>
         <node concept="1U5_Ed" id="2FrZhHc0DCw" role="1UfoCz">
-          <ref role="1U5_Ec" node="2FrZhHc0DC3" />
+          <ref role="1U5_Ec" node="2FrZhHc0DC3" resolve="w" />
         </node>
       </node>
     </node>
diff --git a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.genplan/com.mbeddr.formal.spin.genplan.msd b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.genplan/com.mbeddr.formal.spin.genplan.msd
index 91c1b5186..95fdcfe57 100644
--- a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.genplan/com.mbeddr.formal.spin.genplan.msd
+++ b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.genplan/com.mbeddr.formal.spin.genplan.msd
@@ -15,7 +15,7 @@
     <dependency reexport="false">8ffff4a3-5838-458b-8c6d-7143a3c423b7(com.mbeddr.formal.spin.hdl#2291855968617432607)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1:de.slisson.mps.hacks.xmodelgen" version="0" />
+    <language slang="l:c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1:de.itemis.mps.hacks.xmodelgen" 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="1" />
diff --git a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.genplan/models/plan@genplan.mps b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.genplan/models/plan@genplan.mps
index de13c487f..945fac855 100644
--- a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.genplan/models/plan@genplan.mps
+++ b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.genplan/models/plan@genplan.mps
@@ -4,7 +4,7 @@
   <languages>
     <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="1" />
-    <use id="c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1" name="de.slisson.mps.hacks.xmodelgen" version="0" />
+    <use id="c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1" name="de.itemis.mps.hacks.xmodelgen" version="0" />
   </languages>
   <imports>
     <import index="7qe3" ref="r:65dc22a9-884e-4aad-aa27-16060900ad59(_010_spin_hdl_high_prio@generator)" />
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 f2e64bc61..4808de403 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
@@ -80,7 +80,7 @@
     <language slang="l:7e777b53-0a6b-4719-b36d-10475788d49f:com.mbeddr.formal.safety.stamp" version="2" />
     <language slang="l:eccaed1c-88f4-4a5c-9ad8-d1b8c9f330e9:com.mbeddr.formal.safety.stamp.ext" version="0" />
     <language slang="l:ad8d48af-022b-40dc-8979-2b76074fb438:com.mbeddr.formal.spin" version="0" />
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />
     <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
     <language slang="l:92f195b6-a209-4804-ad65-f5248ecd5873:com.mbeddr.mpsutil.margincell" version="0" />
@@ -97,6 +97,7 @@
     <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" />
     <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:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
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 465685d55..c63194e44 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
@@ -4,7 +4,7 @@
   <imports />
   <registry>
     <language id="2dec0852-3a21-4c4e-a68c-b05236cc37f2" name="com.mbeddr.doc.gen_xhtml">
-      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLDummyRenderer" flags="ng" index="1TaS0h" />
+      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLNoOutputRenderer" flags="ng" index="1TaS0h" />
     </language>
     <language id="2374bc90-7e37-41f1-a9c4-c2e35194c36a" name="com.mbeddr.doc">
       <concept id="6386504476136554612" name="com.mbeddr.doc.structure.PathMapping" flags="ng" index="2SbEIf">
@@ -17,7 +17,7 @@
         <child id="6068976060904007488" name="inactiveRenderer" index="30Gjbi" />
         <child id="6068976060904007489" name="root" index="30Gjbj" />
       </concept>
-      <concept id="3350625596580269173" name="com.mbeddr.doc.structure.NullRenderer" flags="ng" index="1_05Lf" />
+      <concept id="3350625596580269173" name="com.mbeddr.doc.structure.NoOutputRenderer" flags="ng" index="1_05Lf" />
       <concept id="3350625596580256366" name="com.mbeddr.doc.structure.DocumentExport" flags="ng" index="1_08Dk">
         <property id="126932837435324910" name="title" index="WqcPg" />
       </concept>
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 7694ebff2..ee5fb7515 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
@@ -188,76 +188,83 @@
           <node concept="37mRIm" id="x1FXqHmxn" role="37mRID">
             <property role="37mO49" value="9296093161809896" />
             <node concept="gqqVs" id="x1FXqHmxo" role="37mO4d">
-              <property role="gqqTZ" value="145.0" />
-              <property role="gqqTW" value="37.0" />
-              <property role="gqqTX" value="144.0" />
-              <property role="gqqTy" value="69.0" />
+              <property role="gqqTZ" value="242.0" />
+              <property role="gqqTW" value="50.0" />
+              <property role="gqqTX" value="164.0" />
+              <property role="gqqTy" value="76.0" />
               <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
             </node>
           </node>
           <node concept="37mRIm" id="x1FXqHmxp" role="37mRID">
             <property role="37mO49" value="9296093161809903" />
             <node concept="gqqVs" id="x1FXqHmxq" role="37mO4d">
-              <property role="gqqTZ" value="98.0" />
-              <property role="gqqTW" value="136.0" />
-              <property role="gqqTX" value="207.0" />
-              <property role="gqqTy" value="55.0" />
+              <property role="gqqTZ" value="216.0" />
+              <property role="gqqTW" value="186.0" />
+              <property role="gqqTX" value="212.0" />
+              <property role="gqqTy" value="60.0" />
               <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
             </node>
           </node>
           <node concept="37mRIm" id="x1FXqHmxr" role="37mRID">
             <property role="37mO49" value="9296093161809906" />
             <node concept="gqqVs" id="x1FXqHmxs" role="37mO4d">
-              <property role="gqqTZ" value="54.0" />
-              <property role="gqqTW" value="235.0" />
-              <property role="gqqTX" value="93.0" />
-              <property role="gqqTy" value="69.0" />
+              <property role="gqqTZ" value="124.0" />
+              <property role="gqqTW" value="306.0" />
+              <property role="gqqTX" value="126.0" />
+              <property role="gqqTy" value="76.0" />
               <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
             </node>
           </node>
           <node concept="37mRIm" id="x1FXqHmxt" role="37mRID">
             <property role="37mO49" value="9296093161809909" />
             <node concept="gqqVs" id="x1FXqHmxu" role="37mO4d">
-              <property role="gqqTZ" value="36.5" />
-              <property role="gqqTW" value="360.0" />
-              <property role="gqqTX" value="128.0" />
-              <property role="gqqTy" value="41.0" />
+              <property role="gqqTZ" value="112.0" />
+              <property role="gqqTW" value="442.0" />
+              <property role="gqqTX" value="150.0" />
+              <property role="gqqTy" value="44.0" />
               <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
             </node>
           </node>
           <node concept="37mRIm" id="x1FXqHmxv" role="37mRID">
             <property role="37mO49" value="9296093161809912" />
             <node concept="gqqVs" id="x1FXqHmxw" role="37mO4d">
-              <property role="gqqTZ" value="212.0" />
-              <property role="gqqTW" value="237.0" />
-              <property role="gqqTX" value="93.0" />
-              <property role="gqqTy" value="55.0" />
+              <property role="gqqTZ" value="400.0" />
+              <property role="gqqTW" value="306.0" />
+              <property role="gqqTX" value="120.0" />
+              <property role="gqqTy" value="60.0" />
               <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
             </node>
           </node>
           <node concept="37mRIm" id="x1FXqHmxx" role="37mRID">
             <property role="37mO49" value="9296093161809915" />
             <node concept="gqqVs" id="x1FXqHmxy" role="37mO4d">
-              <property role="gqqTZ" value="401.0" />
-              <property role="gqqTW" value="237.0" />
-              <property role="gqqTX" value="170.0" />
-              <property role="gqqTy" value="69.0" />
+              <property role="gqqTZ" value="570.0" />
+              <property role="gqqTW" value="306.0" />
+              <property role="gqqTX" value="174.0" />
+              <property role="gqqTy" value="76.0" />
               <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
             </node>
           </node>
           <node concept="37mRIm" id="x1FXqHmxz" role="37mRID">
             <property role="37mO49" value="9296093161809928" />
             <node concept="2VclpC" id="x1FXqHmx$" role="37mO4d">
-              <node concept="3ul5H1" id="x1FXqHmx_" role="3ul5Gx">
-                <property role="3ul5GH" value="label" />
-                <node concept="3wpmZ1" id="x1FXqHmxA" role="3ul5Gz">
-                  <node concept="2VclrF" id="x1FXqHmxB" role="3wpmZR">
-                    <property role="2Vclpx" value="152.75" />
-                    <property role="2Vclpz" value="112.0" />
+              <node concept="2VclrF" id="3M596RFqqrP" role="2Vcluh">
+                <property role="2Vclpx" value="322.0" />
+                <property role="2Vclpz" value="156.0" />
+              </node>
+              <node concept="2VclrF" id="3M596RFqqrQ" role="2Vcluh">
+                <property role="2Vclpx" value="322.0" />
+                <property role="2Vclpz" value="156.0" />
+              </node>
+              <node concept="3ul5H1" id="3M596RFqqrR" role="3ul5Gx">
+                <node concept="3wpmZ1" id="3M596RFqqrS" role="3ul5Gz">
+                  <node concept="2VclrF" id="3M596RFqqrT" role="3wpmZR">
+                    <property role="2Vclpx" value="0" />
+                    <property role="2Vclpz" value="0" />
                   </node>
-                  <node concept="2VclrF" id="x1FXqHmxC" role="3wpmZP">
-                    <property role="2Vclpx" value="0.0" />
-                    <property role="2Vclpz" value="0.0" />
+                  <node concept="2VclrF" id="3M596RFqqrU" role="3wpmZP">
+                    <property role="2Vclpx" value="260" />
+                    <property role="2Vclpz" value="156" />
                   </node>
                 </node>
               </node>
@@ -266,60 +273,73 @@
           <node concept="37mRIm" id="x1FXqHmxD" role="37mRID">
             <property role="37mO49" value="9296093161809929" />
             <node concept="2VclpC" id="x1FXqHmxE" role="37mO4d">
-              <node concept="3ul5H1" id="x1FXqHmxF" role="3ul5Gx">
-                <property role="3ul5GH" value="label" />
-                <node concept="3wpmZ1" id="x1FXqHmxG" role="3ul5Gz">
-                  <node concept="2VclrF" id="x1FXqHmxH" role="3wpmZR">
-                    <property role="2Vclpx" value="153.25" />
-                    <property role="2Vclpz" value="213.5" />
+              <node concept="2VclrF" id="3M596RFqqrV" role="2Vcluh">
+                <property role="2Vclpx" value="322.0" />
+                <property role="2Vclpz" value="276.0" />
+              </node>
+              <node concept="2VclrF" id="3M596RFqqrW" role="2Vcluh">
+                <property role="2Vclpx" value="187.0" />
+                <property role="2Vclpz" value="276.0" />
+              </node>
+              <node concept="3ul5H1" id="3M596RFqqrX" role="3ul5Gx">
+                <node concept="3wpmZ1" id="3M596RFqqrY" role="3ul5Gz">
+                  <node concept="2VclrF" id="3M596RFqqrZ" role="3wpmZR">
+                    <property role="2Vclpx" value="0" />
+                    <property role="2Vclpz" value="0" />
                   </node>
-                  <node concept="2VclrF" id="x1FXqHmxI" role="3wpmZP">
-                    <property role="2Vclpx" value="0.0" />
-                    <property role="2Vclpz" value="0.0" />
+                  <node concept="2VclrF" id="3M596RFqqs0" role="3wpmZP">
+                    <property role="2Vclpx" value="125" />
+                    <property role="2Vclpz" value="276" />
                   </node>
                 </node>
               </node>
-              <node concept="2VclrF" id="x1FXqHmxJ" role="2Vcluh">
-                <property role="2Vclpx" value="122.0" />
-                <property role="2Vclpz" value="210.0" />
-              </node>
             </node>
           </node>
           <node concept="37mRIm" id="x1FXqHmxK" role="37mRID">
             <property role="37mO49" value="9296093161809930" />
             <node concept="2VclpC" id="x1FXqHmxL" role="37mO4d">
-              <node concept="3ul5H1" id="x1FXqHmxM" role="3ul5Gx">
-                <property role="3ul5GH" value="label" />
-                <node concept="3wpmZ1" id="x1FXqHmxN" role="3ul5Gz">
-                  <node concept="2VclrF" id="x1FXqHmxO" role="3wpmZR">
-                    <property role="2Vclpx" value="293.25" />
-                    <property role="2Vclpz" value="204.0" />
+              <node concept="2VclrF" id="3M596RFqqs1" role="2Vcluh">
+                <property role="2Vclpx" value="322.0" />
+                <property role="2Vclpz" value="276.0" />
+              </node>
+              <node concept="2VclrF" id="3M596RFqqs2" role="2Vcluh">
+                <property role="2Vclpx" value="460.0" />
+                <property role="2Vclpz" value="276.0" />
+              </node>
+              <node concept="3ul5H1" id="3M596RFqqs3" role="3ul5Gx">
+                <node concept="3wpmZ1" id="3M596RFqqs4" role="3ul5Gz">
+                  <node concept="2VclrF" id="3M596RFqqs5" role="3wpmZR">
+                    <property role="2Vclpx" value="0" />
+                    <property role="2Vclpz" value="0" />
                   </node>
-                  <node concept="2VclrF" id="x1FXqHmxP" role="3wpmZP">
-                    <property role="2Vclpx" value="0.0" />
-                    <property role="2Vclpz" value="0.0" />
+                  <node concept="2VclrF" id="3M596RFqqs6" role="3wpmZP">
+                    <property role="2Vclpx" value="398" />
+                    <property role="2Vclpz" value="276" />
                   </node>
                 </node>
               </node>
-              <node concept="2VclrF" id="x1FXqHmxQ" role="2Vcluh">
-                <property role="2Vclpx" value="252.57708713054697" />
-                <property role="2Vclpz" value="225.57708713054697" />
-              </node>
             </node>
           </node>
           <node concept="37mRIm" id="x1FXqHmxR" role="37mRID">
             <property role="37mO49" value="9296093161809931" />
             <node concept="2VclpC" id="x1FXqHmxS" role="37mO4d">
-              <node concept="3ul5H1" id="x1FXqHmxT" role="3ul5Gx">
-                <property role="3ul5GH" value="label" />
-                <node concept="3wpmZ1" id="x1FXqHmxU" role="3ul5Gz">
-                  <node concept="2VclrF" id="x1FXqHmxV" role="3wpmZR">
-                    <property role="2Vclpx" value="111.5" />
-                    <property role="2Vclpz" value="325.0" />
+              <node concept="2VclrF" id="3M596RFqqs7" role="2Vcluh">
+                <property role="2Vclpx" value="187.0" />
+                <property role="2Vclpz" value="412.0" />
+              </node>
+              <node concept="2VclrF" id="3M596RFqqs8" role="2Vcluh">
+                <property role="2Vclpx" value="187.0" />
+                <property role="2Vclpz" value="412.0" />
+              </node>
+              <node concept="3ul5H1" id="3M596RFqqs9" role="3ul5Gx">
+                <node concept="3wpmZ1" id="3M596RFqqsa" role="3ul5Gz">
+                  <node concept="2VclrF" id="3M596RFqqsb" role="3wpmZR">
+                    <property role="2Vclpx" value="0" />
+                    <property role="2Vclpz" value="0" />
                   </node>
-                  <node concept="2VclrF" id="x1FXqHmxW" role="3wpmZP">
-                    <property role="2Vclpx" value="0.0" />
-                    <property role="2Vclpz" value="0.0" />
+                  <node concept="2VclrF" id="3M596RFqqsc" role="3wpmZP">
+                    <property role="2Vclpx" value="125" />
+                    <property role="2Vclpz" value="412" />
                   </node>
                 </node>
               </node>
@@ -328,26 +348,33 @@
           <node concept="37mRIm" id="x1FXqHmxX" role="37mRID">
             <property role="37mO49" value="9296093161809922" />
             <node concept="gqqVs" id="x1FXqHmxY" role="37mO4d">
-              <property role="gqqTX" value="128.0" />
-              <property role="gqqTy" value="41.0" />
-              <property role="gqqTZ" value="177.0" />
-              <property role="gqqTW" value="360.0" />
+              <property role="gqqTX" value="150.0" />
+              <property role="gqqTy" value="44.0" />
+              <property role="gqqTZ" value="292.0" />
+              <property role="gqqTW" value="426.0" />
               <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
             </node>
           </node>
           <node concept="37mRIm" id="x1FXqHmxZ" role="37mRID">
             <property role="37mO49" value="9296093161809932" />
             <node concept="2VclpC" id="x1FXqHmy0" role="37mO4d">
-              <node concept="3ul5H1" id="x1FXqHmy1" role="3ul5Gx">
-                <property role="3ul5GH" value="label" />
-                <node concept="3wpmZ1" id="x1FXqHmy2" role="3ul5Gz">
-                  <node concept="2VclrF" id="x1FXqHmy3" role="3wpmZR">
-                    <property role="2Vclpx" value="196.5" />
-                    <property role="2Vclpz" value="312.5" />
+              <node concept="2VclrF" id="3M596RFqqsd" role="2Vcluh">
+                <property role="2Vclpx" value="460.0" />
+                <property role="2Vclpz" value="396.0" />
+              </node>
+              <node concept="2VclrF" id="3M596RFqqse" role="2Vcluh">
+                <property role="2Vclpx" value="367.0" />
+                <property role="2Vclpz" value="396.0" />
+              </node>
+              <node concept="3ul5H1" id="3M596RFqqsf" role="3ul5Gx">
+                <node concept="3wpmZ1" id="3M596RFqqsg" role="3ul5Gz">
+                  <node concept="2VclrF" id="3M596RFqqsh" role="3wpmZR">
+                    <property role="2Vclpx" value="0" />
+                    <property role="2Vclpz" value="0" />
                   </node>
-                  <node concept="2VclrF" id="x1FXqHmy4" role="3wpmZP">
-                    <property role="2Vclpx" value="0.0" />
-                    <property role="2Vclpz" value="0.0" />
+                  <node concept="2VclrF" id="3M596RFqqsi" role="3wpmZP">
+                    <property role="2Vclpx" value="305" />
+                    <property role="2Vclpz" value="396" />
                   </node>
                 </node>
               </node>
@@ -356,16 +383,23 @@
           <node concept="37mRIm" id="x1FXqHmy5" role="37mRID">
             <property role="37mO49" value="9296093161809933" />
             <node concept="2VclpC" id="x1FXqHmy6" role="37mO4d">
-              <node concept="3ul5H1" id="x1FXqHmy7" role="3ul5Gx">
-                <property role="3ul5GH" value="label" />
-                <node concept="3wpmZ1" id="x1FXqHmy8" role="3ul5Gz">
-                  <node concept="2VclrF" id="x1FXqHmy9" role="3wpmZR">
-                    <property role="2Vclpx" value="324.75" />
-                    <property role="2Vclpz" value="246.5" />
+              <node concept="2VclrF" id="3M596RFqqsp" role="2Vcluh">
+                <property role="2Vclpx" value="520.0" />
+                <property role="2Vclpz" value="336.0" />
+              </node>
+              <node concept="2VclrF" id="3M596RFqqsq" role="2Vcluh">
+                <property role="2Vclpx" value="570.0" />
+                <property role="2Vclpz" value="344.0" />
+              </node>
+              <node concept="3ul5H1" id="3M596RFqqsr" role="3ul5Gx">
+                <node concept="3wpmZ1" id="3M596RFqqss" role="3ul5Gz">
+                  <node concept="2VclrF" id="3M596RFqqst" role="3wpmZR">
+                    <property role="2Vclpx" value="0" />
+                    <property role="2Vclpz" value="0" />
                   </node>
-                  <node concept="2VclrF" id="x1FXqHmya" role="3wpmZP">
-                    <property role="2Vclpx" value="0.0" />
-                    <property role="2Vclpz" value="0.0" />
+                  <node concept="2VclrF" id="3M596RFqqsu" role="3wpmZP">
+                    <property role="2Vclpx" value="458" />
+                    <property role="2Vclpz" value="336" />
                   </node>
                 </node>
               </node>
@@ -374,37 +408,36 @@
           <node concept="37mRIm" id="x1FXqHmyb" role="37mRID">
             <property role="37mO49" value="9296093161809925" />
             <node concept="gqqVs" id="x1FXqHmyc" role="37mO4d">
-              <property role="gqqTX" value="128.0" />
-              <property role="gqqTy" value="41.0" />
-              <property role="gqqTZ" value="322.5" />
-              <property role="gqqTW" value="360.0" />
+              <property role="gqqTX" value="156.0" />
+              <property role="gqqTy" value="44.0" />
+              <property role="gqqTZ" value="472.0" />
+              <property role="gqqTW" value="426.0" />
               <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
             </node>
           </node>
           <node concept="37mRIm" id="x1FXqHmyd" role="37mRID">
             <property role="37mO49" value="9296093161809934" />
             <node concept="2VclpC" id="x1FXqHmye" role="37mO4d">
-              <node concept="3ul5H1" id="x1FXqHmyf" role="3ul5Gx">
-                <property role="3ul5GH" value="label" />
-                <node concept="3wpmZ1" id="x1FXqHmyg" role="3ul5Gz">
-                  <node concept="2VclrF" id="x1FXqHmyh" role="3wpmZR">
-                    <property role="2Vclpx" value="316.0" />
-                    <property role="2Vclpz" value="317.5" />
+              <node concept="2VclrF" id="3M596RFqqsj" role="2Vcluh">
+                <property role="2Vclpx" value="460.0" />
+                <property role="2Vclpz" value="396.0" />
+              </node>
+              <node concept="2VclrF" id="3M596RFqqsk" role="2Vcluh">
+                <property role="2Vclpx" value="550.0" />
+                <property role="2Vclpz" value="396.0" />
+              </node>
+              <node concept="3ul5H1" id="3M596RFqqsl" role="3ul5Gx">
+                <node concept="3wpmZ1" id="3M596RFqqsm" role="3ul5Gz">
+                  <node concept="2VclrF" id="3M596RFqqsn" role="3wpmZR">
+                    <property role="2Vclpx" value="0" />
+                    <property role="2Vclpz" value="0" />
                   </node>
-                  <node concept="2VclrF" id="x1FXqHmyi" role="3wpmZP">
-                    <property role="2Vclpx" value="0.0" />
-                    <property role="2Vclpz" value="0.0" />
+                  <node concept="2VclrF" id="3M596RFqqso" role="3wpmZP">
+                    <property role="2Vclpx" value="488" />
+                    <property role="2Vclpz" value="396" />
                   </node>
                 </node>
               </node>
-              <node concept="2VclrF" id="x1FXqHmyj" role="2Vcluh">
-                <property role="2Vclpx" value="282.7351203220828" />
-                <property role="2Vclpz" value="314.2648796779172" />
-              </node>
-              <node concept="2VclrF" id="x1FXqHmyk" role="2Vcluh">
-                <property role="2Vclpx" value="383.79379605205486" />
-                <property role="2Vclpz" value="314.2649472338101" />
-              </node>
             </node>
           </node>
           <node concept="37mRIm" id="x1FXqHnjj" role="37mRID">
@@ -428,26 +461,29 @@
           <node concept="37mRIm" id="x1FXqHFHu" role="37mRID">
             <property role="37mO49" value="9296093161896794" />
             <node concept="gqqVs" id="x1FXqHFHt" role="37mO4d">
-              <property role="gqqTZ" value="401.0" />
-              <property role="gqqTW" value="37.0" />
-              <property role="gqqTX" value="104.0" />
-              <property role="gqqTy" value="69.0" />
+              <property role="gqqTZ" value="30.0" />
+              <property role="gqqTW" value="50.0" />
+              <property role="gqqTX" value="140.0" />
+              <property role="gqqTy" value="76.0" />
               <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
             </node>
           </node>
           <node concept="37mRIm" id="x1FXqHFUV" role="37mRID">
             <property role="37mO49" value="9296093161897586" />
             <node concept="2VclpC" id="x1FXqHFUU" role="37mO4d">
-              <node concept="3ul5H1" id="x1FXqHFUW" role="3ul5Gx">
-                <property role="3ul5GH" value="label" />
-                <node concept="3wpmZ1" id="x1FXqHFUX" role="3ul5Gz">
-                  <node concept="2VclrF" id="x1FXqHFUY" role="3wpmZR">
-                    <property role="2Vclpx" value="335.0" />
-                    <property role="2Vclpz" value="71.5" />
+              <node concept="2VclrF" id="3M596RFqqsv" role="2Vcluh">
+                <property role="2Vclpx" value="190.0" />
+                <property role="2Vclpz" value="88.0" />
+              </node>
+              <node concept="3ul5H1" id="3M596RFqqsx" role="3ul5Gx">
+                <node concept="3wpmZ1" id="3M596RFqqsy" role="3ul5Gz">
+                  <node concept="2VclrF" id="3M596RFqqsz" role="3wpmZR">
+                    <property role="2Vclpx" value="0" />
+                    <property role="2Vclpz" value="0" />
                   </node>
-                  <node concept="2VclrF" id="x1FXqHFUZ" role="3wpmZP">
-                    <property role="2Vclpx" value="0.0" />
-                    <property role="2Vclpz" value="0.0" />
+                  <node concept="2VclrF" id="3M596RFqqs$" role="3wpmZP">
+                    <property role="2Vclpx" value="178" />
+                    <property role="2Vclpz" value="88" />
                   </node>
                 </node>
               </node>
@@ -472,10 +508,10 @@
       <node concept="37mRIm" id="x1FXqHm_Z" role="37mRID">
         <property role="37mO49" value="9296093161809892" />
         <node concept="gqqVs" id="x1FXqHm_X" role="37mO4d">
-          <property role="gqqTZ" value="336.0" />
+          <property role="gqqTZ" value="305.0" />
           <property role="gqqTW" value="280.0" />
-          <property role="gqqTX" value="595.0" />
-          <property role="gqqTy" value="423.0" />
+          <property role="gqqTX" value="766.0" />
+          <property role="gqqTy" value="508.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -484,8 +520,8 @@
         <node concept="gqqVs" id="x1FXqHmO$" role="37mO4d">
           <property role="gqqTZ" value="232.0" />
           <property role="gqqTW" value="50.0" />
-          <property role="gqqTX" value="113.0" />
-          <property role="gqqTy" value="55.0" />
+          <property role="gqqTX" value="144.0" />
+          <property role="gqqTy" value="60.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -505,7 +541,7 @@
           <property role="gqqTZ" value="190.5" />
           <property role="gqqTW" value="148.0" />
           <property role="gqqTX" value="196.0" />
-          <property role="gqqTy" value="69.0" />
+          <property role="gqqTy" value="76.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
         </node>
       </node>
@@ -530,6 +566,14 @@
       <node concept="37mRIm" id="x1FXqHGbX" role="37mRID">
         <property role="37mO49" value="9296093161898682" />
         <node concept="2VclpC" id="x1FXqHGbW" role="37mO4d">
+          <node concept="2VclrF" id="x1FXqHGh$" role="2Vcluh">
+            <property role="2Vclpx" value="326.85517699520517" />
+            <property role="2Vclpz" value="246.1448230047949" />
+          </node>
+          <node concept="2VclrF" id="x1FXqHGiF" role="2Vcluh">
+            <property role="2Vclpx" value="633.4354714966942" />
+            <property role="2Vclpz" value="246.144866950918" />
+          </node>
           <node concept="3ul5H1" id="x1FXqHGbY" role="3ul5Gx">
             <property role="3ul5GH" value="label" />
             <node concept="3wpmZ1" id="x1FXqHGbZ" role="3ul5Gz">
@@ -543,21 +587,13 @@
               </node>
             </node>
           </node>
-          <node concept="2VclrF" id="x1FXqHGh$" role="2Vcluh">
-            <property role="2Vclpx" value="296.85517699520517" />
-            <property role="2Vclpz" value="246.1448230047949" />
-          </node>
-          <node concept="2VclrF" id="x1FXqHGiF" role="2Vcluh">
-            <property role="2Vclpx" value="563.855133049082" />
-            <property role="2Vclpz" value="246.144866950918" />
-          </node>
         </node>
       </node>
       <node concept="37mRIm" id="x1FXqHGlP" role="37mRID">
         <property role="37mO49" value="9296093161899378" />
         <node concept="gqqVs" id="x1FXqHGlQ" role="37mO4d">
-          <property role="gqqTX" value="158.0" />
-          <property role="gqqTy" value="97.0" />
+          <property role="gqqTX" value="216.0" />
+          <property role="gqqTy" value="108.0" />
           <property role="gqqTZ" value="50.0" />
           <property role="gqqTW" value="280.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
@@ -566,6 +602,14 @@
       <node concept="37mRIm" id="x1FXqHGre" role="37mRID">
         <property role="37mO49" value="9296093161899658" />
         <node concept="2VclpC" id="x1FXqHGrd" role="37mO4d">
+          <node concept="2VclrF" id="x1FXqHGsY" role="2Vcluh">
+            <property role="2Vclpx" value="221.0" />
+            <property role="2Vclpz" value="244.9800079936064" />
+          </node>
+          <node concept="2VclrF" id="x1FXqHGsZ" role="2Vcluh">
+            <property role="2Vclpx" value="187.0" />
+            <property role="2Vclpz" value="244.9800079936064" />
+          </node>
           <node concept="3ul5H1" id="x1FXqHGrf" role="3ul5Gx">
             <property role="3ul5GH" value="label" />
             <node concept="3wpmZ1" id="x1FXqHGrg" role="3ul5Gz">
@@ -579,14 +623,6 @@
               </node>
             </node>
           </node>
-          <node concept="2VclrF" id="x1FXqHGsY" role="2Vcluh">
-            <property role="2Vclpx" value="221.0" />
-            <property role="2Vclpz" value="244.9800079936064" />
-          </node>
-          <node concept="2VclrF" id="x1FXqHGsZ" role="2Vcluh">
-            <property role="2Vclpx" value="187.0" />
-            <property role="2Vclpz" value="244.9800079936064" />
-          </node>
         </node>
       </node>
     </node>
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/com.mbeddr.formal.safety.users_guide.msd b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/com.mbeddr.formal.safety.users_guide.msd
index 805345b2d..d92b29bde 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/com.mbeddr.formal.safety.users_guide.msd
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/com.mbeddr.formal.safety.users_guide.msd
@@ -20,7 +20,7 @@
     <language slang="l:2374bc90-7e37-41f1-a9c4-c2e35194c36a:com.mbeddr.doc" version="4" />
     <language slang="l:f44f6b9a-bf30-4f73-866e-fac17c177409:com.mbeddr.doc.gen_latex" version="0" />
     <language slang="l:2dec0852-3a21-4c4e-a68c-b05236cc37f2:com.mbeddr.doc.gen_xhtml" version="1" />
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />
     <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
     <language slang="l:92f195b6-a209-4804-ad65-f5248ecd5873:com.mbeddr.mpsutil.margincell" version="0" />
@@ -34,6 +34,7 @@
     <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:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
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 524ed4b90..ff853e07b 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
@@ -4,7 +4,7 @@
   <imports />
   <registry>
     <language id="2dec0852-3a21-4c4e-a68c-b05236cc37f2" name="com.mbeddr.doc.gen_xhtml">
-      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLDummyRenderer" flags="ng" index="1TaS0h" />
+      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLNoOutputRenderer" flags="ng" index="1TaS0h" />
     </language>
     <language id="2374bc90-7e37-41f1-a9c4-c2e35194c36a" name="com.mbeddr.doc">
       <concept id="6386504476136554612" name="com.mbeddr.doc.structure.PathMapping" flags="ng" index="2SbEIf">
@@ -17,7 +17,7 @@
         <child id="6068976060904007488" name="inactiveRenderer" index="30Gjbi" />
         <child id="6068976060904007489" name="root" index="30Gjbj" />
       </concept>
-      <concept id="3350625596580269173" name="com.mbeddr.doc.structure.NullRenderer" flags="ng" index="1_05Lf" />
+      <concept id="3350625596580269173" name="com.mbeddr.doc.structure.NoOutputRenderer" flags="ng" index="1_05Lf" />
       <concept id="3350625596580256366" name="com.mbeddr.doc.structure.DocumentExport" flags="ng" index="1_08Dk">
         <property id="126932837435324910" name="title" index="WqcPg" />
       </concept>