diff --git a/code/languages/com.fasten.symo/.mps/modules.xml b/code/languages/com.fasten.symo/.mps/modules.xml
index f2b999871..6c8a09d9e 100644
--- a/code/languages/com.fasten.symo/.mps/modules.xml
+++ b/code/languages/com.fasten.symo/.mps/modules.xml
@@ -2,6 +2,7 @@
 <project version="4">
   <component name="MPSProject">
     <projectModules>
+      <modulePath path="$PROJECT_DIR$/devkits/fasten.symo.plantuml/fasten.symo.plantuml.devkit" folder="plantuml" />
       <modulePath path="$PROJECT_DIR$/languages/com.fasten.symo.hw/com.fasten.symo.hw.mpl" folder="" />
       <modulePath path="$PROJECT_DIR$/languages/com.symo.plantuml/com.symo.plantuml.mpl" folder="plantuml" />
       <modulePath path="$PROJECT_DIR$/languages/com.symo.sysml.ibd/com.symo.sysml.ibd.mpl" folder="" />
diff --git a/code/languages/com.fasten.symo/devkits/fasten.symo.plantuml/fasten.symo.plantuml.devkit b/code/languages/com.fasten.symo/devkits/fasten.symo.plantuml/fasten.symo.plantuml.devkit
new file mode 100644
index 000000000..82253edf3
--- /dev/null
+++ b/code/languages/com.fasten.symo/devkits/fasten.symo.plantuml/fasten.symo.plantuml.devkit
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dev-kit name="fasten.symo.plantuml" uuid="114acb95-50b2-4e9b-81c6-e0c665740eae">
+  <exported-language name="6f31bc85-cbcc-4dcf-ada4-35da43e6832c(com.symo.plantuml)" />
+  <exported-solutions>
+    <exported-solution>377bf088-4ffc-48ac-910f-fb1c66ffa60e(com.symo.plantuml.lib)</exported-solution>
+  </exported-solutions>
+</dev-kit>
+
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 d268f8a6b..3c96f049f 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
@@ -14,6 +14,7 @@
   <dependencies>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="true">1144260c-e9a5-49a2-9add-39a1a1a7077e(de.itemis.mps.editor.diagram.runtime)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="1" />
@@ -60,6 +61,7 @@
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="c2f3ae03-6a71-4e2a-88c9-c9e6eb4e20fa(com.fasten.symo.hw)" version="0" />
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="7b45fa94-2707-4a1a-9e6a-ce40c4aaf35a(de.itemis.mps.editor.collapsible.runtime)" version="0" />
diff --git a/code/languages/com.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 b70e976a5..2f73d0ada 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
@@ -9,6 +9,7 @@
   <imports>
     <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
     <import index="nkm5" ref="r:095345ad-6627-42ca-9d3f-fc1b2d9fbd61(de.itemis.mps.editor.diagram.runtime.model)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="osta" ref="r:20be8470-9022-48a8-b125-64f3bb097af5(com.fasten.symo.hw.structure)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
@@ -210,7 +211,7 @@
     <ref role="1XX52x" to="osta:2gpUZARgYrl" resolve="PlatformArchitecture" />
     <node concept="3EZMnI" id="2gpUZARgYI6" role="2wV5jI">
       <node concept="PMmxH" id="2gpUZARgZ67" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3F0ifn" id="2gpUZARgZdH" role="3EZMnx" />
       <node concept="27vDVx" id="2gpUZARgZlo" role="3EZMnx">
diff --git a/code/languages/com.fasten.symo/languages/com.symo.plantuml/com.symo.plantuml.mpl b/code/languages/com.fasten.symo/languages/com.symo.plantuml/com.symo.plantuml.mpl
index 7fab2db3b..4334e7c4f 100644
--- a/code/languages/com.fasten.symo/languages/com.symo.plantuml/com.symo.plantuml.mpl
+++ b/code/languages/com.fasten.symo/languages/com.symo.plantuml/com.symo.plantuml.mpl
@@ -61,6 +61,7 @@
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="2" />
@@ -107,6 +108,7 @@
     <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="6f31bc85-cbcc-4dcf-ada4-35da43e6832c(com.symo.plantuml)" version="0" />
     <module reference="377bf088-4ffc-48ac-910f-fb1c66ffa60e(com.symo.plantuml.lib)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
diff --git a/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.behavior.mps b/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.behavior.mps
index 51ae0878c..d31349136 100644
--- a/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.behavior.mps
+++ b/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.behavior.mps
@@ -341,7 +341,7 @@
         </node>
         <node concept="3clFbF" id="1I7wo92WWdt" role="3cqZAp">
           <node concept="37vLTw" id="7ikA1GKvxTY" role="3clFbG">
-            <ref role="3cqZAo" node="7ikA1GKvxTS" resolve="string" />
+            <ref role="3cqZAo" node="7ikA1GKvxTS" resolve="basicComponent" />
           </node>
         </node>
       </node>
@@ -1018,7 +1018,7 @@
         </node>
         <node concept="3clFbF" id="6CyxyHi8x6k" role="3cqZAp">
           <node concept="37vLTw" id="6CyxyHid7Lu" role="3clFbG">
-            <ref role="3cqZAo" node="6CyxyHid7Lo" resolve="string" />
+            <ref role="3cqZAo" node="6CyxyHid7Lo" resolve="str" />
           </node>
         </node>
       </node>
@@ -1100,7 +1100,7 @@
         </node>
         <node concept="3clFbF" id="6CyxyHibNO0" role="3cqZAp">
           <node concept="37vLTw" id="6CyxyHibOkE" role="3clFbG">
-            <ref role="3cqZAo" node="6CyxyHibOkC" resolve="string" />
+            <ref role="3cqZAo" node="6CyxyHibOkC" resolve="str" />
           </node>
         </node>
       </node>
@@ -1239,7 +1239,7 @@
               </node>
             </node>
             <node concept="WFELt" id="6BNnCp_pDwM" role="2OqNvi">
-              <ref role="1A0vxQ" to="udwj:1I7wo92VgAs" resolve="StartUmlCommand" />
+              <ref role="1A0vxQ" to="udwj:1I7wo92VgG3" resolve="EndUmlCommand" />
             </node>
           </node>
         </node>
diff --git a/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.editor.mps b/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.editor.mps
index ef53c70f5..e841a337b 100644
--- a/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.editor.mps
+++ b/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.editor.mps
@@ -28,6 +28,7 @@
     <import index="iyaa" ref="377bf088-4ffc-48ac-910f-fb1c66ffa60e/java:org.apache.batik.anim.dom(com.symo.plantuml.lib/)" />
     <import index="e373" ref="377bf088-4ffc-48ac-910f-fb1c66ffa60e/java:org.apache.batik.util(com.symo.plantuml.lib/)" />
     <import index="udwj" ref="r:3cfd1ac4-92be-4123-8876-78cf444bfbcb(com.symo.plantuml.structure)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="4anb" ref="377bf088-4ffc-48ac-910f-fb1c66ffa60e/java:org.apache.batik.swing.svg(com.symo.plantuml.lib/)" implicit="true" />
     <import index="lc7h" ref="r:9af299a8-c69a-4780-9c99-063ff8f4181a(com.symo.plantuml.behavior)" implicit="true" />
     <import index="4anc" ref="5ad14eca-28d7-4bce-b8e0-648908a49062/java:org.apache.batik.swing.svg(org.apache.batik/)" implicit="true" />
@@ -46,15 +47,11 @@
         <child id="1176897874615" name="nodeFactory" index="4_6I_" />
         <child id="1140524464360" name="cellLayout" index="2czzBx" />
       </concept>
-      <concept id="1078308402140" name="jetbrains.mps.lang.editor.structure.CellModel_Custom" flags="sg" stub="8104358048506730068" index="gc7cB">
-        <child id="1176795024817" name="cellProvider" index="3YsKMw" />
-      </concept>
       <concept id="1106270549637" name="jetbrains.mps.lang.editor.structure.CellLayout_Horizontal" flags="nn" index="2iRfu4" />
       <concept id="1106270571710" name="jetbrains.mps.lang.editor.structure.CellLayout_Vertical" flags="nn" index="2iRkQZ" />
       <concept id="3308309804690746362" name="jetbrains.mps.lang.editor.structure.QueryFunction_ColorComposit" flags="ig" index="mot77" />
       <concept id="1142886221719" name="jetbrains.mps.lang.editor.structure.QueryFunction_NodeCondition" flags="in" index="pkWqt" />
       <concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
-      <concept id="1237385578942" name="jetbrains.mps.lang.editor.structure.IndentLayoutOnNewLineStyleClassItem" flags="ln" index="pVoyu" />
       <concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
         <child id="1080736633877" name="cellModel" index="2wV5jI" />
       </concept>
@@ -116,7 +113,6 @@
         <reference id="7033942394256351817" name="editorComponent" index="1PE7su" />
       </concept>
       <concept id="1161622981231" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_editorContext" flags="nn" index="1Q80Hx" />
-      <concept id="1176749715029" name="jetbrains.mps.lang.editor.structure.QueryFunction_CellProvider" flags="in" index="3VJUX4" />
       <concept id="1198256887712" name="jetbrains.mps.lang.editor.structure.CellModel_Indent" flags="ng" index="3XFhqQ" />
       <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
         <reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
@@ -206,15 +202,12 @@
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
       <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
-        <property id="4276006055363816570" name="isSynchronized" index="od$2w" />
-        <property id="1181808852946" name="isFinal" index="DiZV1" />
         <child id="1068580123133" name="returnType" index="3clF45" />
         <child id="1068580123134" name="parameter" index="3clF46" />
         <child id="1068580123135" name="body" index="3clF47" />
       </concept>
-      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_">
-        <property id="1178608670077" name="isAbstract" index="1EzhhJ" />
-      </concept>
+      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_" />
+      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
@@ -411,7 +404,7 @@
                   <node concept="1pGfFk" id="25fKBAPJuSH" role="2ShVmc">
                     <ref role="37wK5l" to="81o:~SourceStringReader.&lt;init&gt;(java.lang.String)" resolve="SourceStringReader" />
                     <node concept="37vLTw" id="25fKBAPJuSI" role="37wK5m">
-                      <ref role="3cqZAo" node="25fKBAPJuvb" resolve="source" />
+                      <ref role="3cqZAo" node="25fKBAPJuvb" resolve="plantumlString" />
                     </node>
                   </node>
                 </node>
@@ -486,7 +479,7 @@
                 <node concept="2xdQw9" id="47IPWgLNm52" role="3cqZAp">
                   <node concept="3cpWs3" id="47IPWgLNoFb" role="9lYJi">
                     <node concept="37vLTw" id="47IPWgLNpxI" role="3uHU7w">
-                      <ref role="3cqZAo" node="25fKBAPJuvb" resolve="source" />
+                      <ref role="3cqZAo" node="25fKBAPJuvb" resolve="plantumlString" />
                     </node>
                     <node concept="Xl_RD" id="47IPWgLNm54" role="3uHU7B">
                       <property role="Xl_RC" value="diagram string: " />
@@ -505,19 +498,27 @@
                   </node>
                 </node>
               </node>
-              <node concept="2OqwBi" id="7ikA1GKut0k" role="3clFbw">
-                <node concept="2OqwBi" id="7ikA1GKuoSb" role="2Oq$k0">
-                  <node concept="37vLTw" id="7ikA1GKunY6" role="2Oq$k0">
+              <node concept="22lmx$" id="75npNYZx9Z7" role="3clFbw">
+                <node concept="3clFbC" id="75npNYZxbFj" role="3uHU7B">
+                  <node concept="10Nm6u" id="75npNYZxcMp" role="3uHU7w" />
+                  <node concept="37vLTw" id="75npNYZxb33" role="3uHU7B">
                     <ref role="3cqZAo" node="25fKBAPJuvw" resolve="desc" />
                   </node>
-                  <node concept="liA8E" id="7ikA1GKusHR" role="2OqNvi">
-                    <ref role="37wK5l" to="asup:~DiagramDescription.getDescription()" resolve="getDescription" />
-                  </node>
                 </node>
-                <node concept="liA8E" id="7ikA1GKuuw0" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
-                  <node concept="Xl_RD" id="7ikA1GKuuZC" role="37wK5m">
-                    <property role="Xl_RC" value="Error" />
+                <node concept="2OqwBi" id="7ikA1GKut0k" role="3uHU7w">
+                  <node concept="2OqwBi" id="7ikA1GKuoSb" role="2Oq$k0">
+                    <node concept="37vLTw" id="7ikA1GKunY6" role="2Oq$k0">
+                      <ref role="3cqZAo" node="25fKBAPJuvw" resolve="desc" />
+                    </node>
+                    <node concept="liA8E" id="7ikA1GKusHR" role="2OqNvi">
+                      <ref role="37wK5l" to="asup:~DiagramDescription.getDescription()" resolve="getDescription" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="7ikA1GKuuw0" role="2OqNvi">
+                    <ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
+                    <node concept="Xl_RD" id="7ikA1GKuuZC" role="37wK5m">
+                      <property role="Xl_RC" value="Error" />
+                    </node>
                   </node>
                 </node>
               </node>
@@ -593,7 +594,7 @@
                 </node>
                 <node concept="2ShNRf" id="25fKBAPL5a1" role="33vP2m">
                   <node concept="1pGfFk" id="79fxyvP7hSL" role="2ShVmc">
-                    <ref role="37wK5l" node="7ikA1GKAaW7" resolve="MyJSVGCanvas" />
+                    <ref role="37wK5l" node="7ikA1GKAaW7" resolve="SVGGenerator.MyJSVGCanvas" />
                     <node concept="2OqwBi" id="7ikA1GKDWvg" role="37wK5m">
                       <node concept="37vLTw" id="7ikA1GKDV6f" role="2Oq$k0">
                         <ref role="3cqZAo" node="1I7wo92VPOf" resolve="diagram" />
@@ -1140,7 +1141,7 @@
           </node>
         </node>
         <node concept="2AHcQZ" id="7ikA1GKGeyd" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" />
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
     </node>
@@ -1175,7 +1176,7 @@
                     </node>
                     <node concept="21noJN" id="1I7wo92WyUY" role="2OqNvi">
                       <node concept="21nZrQ" id="1I7wo92WyV0" role="21noJM">
-                        <ref role="21nZrZ" to="udwj:1I7wo92WvVO" resolve="TEXT_DIAGRAM" />
+                        <ref role="21nZrZ" to="udwj:1I7wo92WvVO" resolve="TEXT_AND_DIAGRAM" />
                       </node>
                     </node>
                   </node>
@@ -1358,100 +1359,8 @@
   <node concept="24kQdi" id="1I7wo92Xp9Y">
     <ref role="1XX52x" to="udwj:1I7wo92Vbhy" resolve="PlantUmlRoot" />
     <node concept="3EZMnI" id="1I7wo92Xpa0" role="2wV5jI">
-      <node concept="3EZMnI" id="1I7wo92Xpa4" role="3EZMnx">
-        <node concept="VPM3Z" id="1I7wo92Xpa6" role="3F10Kt" />
-        <node concept="3F0ifn" id="1I7wo92Xpaa" role="3EZMnx">
-          <property role="3F0ifm" value="Plant UML Diagrams Root:" />
-          <ref role="1k5W1q" node="1I7wo92Xwi0" resolve="PlantUmlKeyword" />
-        </node>
-        <node concept="3F0A7n" id="1I7wo92Xpad" role="3EZMnx">
-          <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-        </node>
-        <node concept="2iRfu4" id="1I7wo92Xpa9" role="2iSdaV" />
-      </node>
-      <node concept="gc7cB" id="3Dgh5aYjhcd" role="3EZMnx">
-        <node concept="3VJUX4" id="3Dgh5aYjhce" role="3YsKMw">
-          <node concept="3clFbS" id="3Dgh5aYjhcf" role="2VODD2">
-            <node concept="3clFbF" id="14CuINs3AmH" role="3cqZAp">
-              <node concept="2ShNRf" id="14CuINs3AmD" role="3clFbG">
-                <node concept="YeOm9" id="14CuINs3ALc" role="2ShVmc">
-                  <node concept="1Y3b0j" id="14CuINs3ALf" role="YeSDq">
-                    <property role="2bfB8j" value="true" />
-                    <ref role="37wK5l" to="exr9:~AbstractCellProvider.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNode)" resolve="AbstractCellProvider" />
-                    <ref role="1Y3XeK" to="exr9:~AbstractCellProvider" resolve="AbstractCellProvider" />
-                    <node concept="3Tm1VV" id="14CuINs3ALg" role="1B3o_S" />
-                    <node concept="3clFb_" id="14CuINs3ALh" role="jymVt">
-                      <property role="1EzhhJ" value="false" />
-                      <property role="TrG5h" value="createEditorCell" />
-                      <property role="DiZV1" value="false" />
-                      <property role="od$2w" value="false" />
-                      <node concept="3Tm1VV" id="14CuINs3ALi" role="1B3o_S" />
-                      <node concept="3uibUv" id="14CuINs3ALk" role="3clF45">
-                        <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-                      </node>
-                      <node concept="37vLTG" id="14CuINs3ALl" role="3clF46">
-                        <property role="TrG5h" value="p0" />
-                        <node concept="3uibUv" id="14CuINs3ALm" role="1tU5fm">
-                          <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
-                        </node>
-                      </node>
-                      <node concept="3clFbS" id="14CuINs3ALn" role="3clF47">
-                        <node concept="3cpWs8" id="14CuINs3prj" role="3cqZAp">
-                          <node concept="3cpWsn" id="14CuINs3prk" role="3cpWs9">
-                            <property role="TrG5h" value="hlc" />
-                            <node concept="3uibUv" id="14CuINs3prf" role="1tU5fm">
-                              <ref role="3uigEE" to="mc8f:4U82Y3yZDCl" resolve="HorizontalLineCell" />
-                            </node>
-                            <node concept="2ShNRf" id="14CuINs3prl" role="33vP2m">
-                              <node concept="1pGfFk" id="14CuINs3prm" role="2ShVmc">
-                                <ref role="37wK5l" to="mc8f:4U82Y3yZF0a" resolve="HorizontalLineCell" />
-                                <node concept="1Q80Hx" id="14CuINs3prn" role="37wK5m" />
-                                <node concept="pncrf" id="14CuINs3pro" role="37wK5m" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbF" id="14CuINs2S6p" role="3cqZAp">
-                          <node concept="2OqwBi" id="14CuINs3$ju" role="3clFbG">
-                            <node concept="37vLTw" id="14CuINs3prp" role="2Oq$k0">
-                              <ref role="3cqZAo" node="14CuINs3prk" resolve="hlc" />
-                            </node>
-                            <node concept="liA8E" id="14CuINs3DJ7" role="2OqNvi">
-                              <ref role="37wK5l" to="mc8f:4U82Y3yZLMv" resolve="setColor" />
-                              <node concept="2ShNRf" id="V$JATDKNHs" role="37wK5m">
-                                <node concept="1pGfFk" id="V$JATDL27l" role="2ShVmc">
-                                  <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
-                                  <node concept="2nou5x" id="V$JATDL2iB" role="37wK5m">
-                                    <property role="2noCCI" value="E1" />
-                                  </node>
-                                  <node concept="2nou5x" id="V$JATDL2xQ" role="37wK5m">
-                                    <property role="2noCCI" value="E1" />
-                                  </node>
-                                  <node concept="2nou5x" id="V$JATDL2PP" role="37wK5m">
-                                    <property role="2noCCI" value="E1" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbF" id="14CuINs3Gwq" role="3cqZAp">
-                          <node concept="37vLTw" id="14CuINs3Gwo" role="3clFbG">
-                            <ref role="3cqZAo" node="14CuINs3prk" resolve="hlc" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="pncrf" id="14CuINs3He0" role="37wK5m" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="pVoyu" id="3Dgh5aYjqz$" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
+      <node concept="PMmxH" id="4lJSf3Lv4DP" role="3EZMnx">
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3F0ifn" id="1I7wo92ZMYY" role="3EZMnx" />
       <node concept="3F2HdR" id="1I7wo92Xpah" role="3EZMnx">
@@ -1583,7 +1492,7 @@
   </node>
   <node concept="PKFIW" id="1I7wo92Y2U2">
     <property role="TrG5h" value="DummyForGrammarCells" />
-    <ref role="1XX52x" to="tpck:gw2VY9q" />
+    <ref role="1XX52x" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="3F0ifn" id="1I7wo92Y2U3" role="2wV5jI">
       <property role="3F0ifm" value="Workaround to fix contributions to BaseConcept generated by grammarCells." />
     </node>
@@ -1751,7 +1660,7 @@
                         <property role="2bfB8j" value="true" />
                         <property role="373rjd" value="true" />
                         <ref role="1Y3XeK" to="hyam:~ActionListener" resolve="ActionListener" />
-                        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
+                        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                         <node concept="3Tm1VV" id="d2SOqiqZt_" role="1B3o_S" />
                         <node concept="3clFb_" id="d2SOqiqZtN" role="jymVt">
                           <property role="TrG5h" value="actionPerformed" />
@@ -1804,7 +1713,7 @@
                             </node>
                           </node>
                           <node concept="2AHcQZ" id="d2SOqiqZtV" role="2AJF6D">
-                            <ref role="2AI5Lk" to="wyt6:~Override" />
+                            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                           </node>
                         </node>
                       </node>
@@ -1815,7 +1724,7 @@
             </node>
             <node concept="3clFbF" id="d2SOqiqpuU" role="3cqZAp">
               <node concept="37vLTw" id="d2SOqiqN89" role="3clFbG">
-                <ref role="3cqZAo" node="d2SOqiqN85" resolve="button" />
+                <ref role="3cqZAo" node="d2SOqiqN85" resolve="zoomIn" />
               </node>
             </node>
           </node>
@@ -1876,7 +1785,7 @@
                         <property role="2bfB8j" value="true" />
                         <property role="373rjd" value="true" />
                         <ref role="1Y3XeK" to="hyam:~ActionListener" resolve="ActionListener" />
-                        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
+                        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                         <node concept="3Tm1VV" id="d2SOqirb_3" role="1B3o_S" />
                         <node concept="3clFb_" id="d2SOqirb_4" role="jymVt">
                           <property role="TrG5h" value="actionPerformed" />
@@ -1929,7 +1838,7 @@
                             </node>
                           </node>
                           <node concept="2AHcQZ" id="d2SOqirb_m" role="2AJF6D">
-                            <ref role="2AI5Lk" to="wyt6:~Override" />
+                            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.structure.mps b/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.structure.mps
index 104c5d633..d73be2114 100644
--- a/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.structure.mps
+++ b/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.structure.mps
@@ -10,6 +10,24 @@
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
   </imports>
   <registry>
+    <language id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources">
+      <concept id="2756621024541681841" name="jetbrains.mps.lang.resources.structure.Primitive" flags="ng" index="1irPi6">
+        <child id="1860120738943552529" name="fillColor" index="3PKjn_" />
+        <child id="1860120738943552531" name="borderColor" index="3PKjnB" />
+      </concept>
+      <concept id="2756621024541681849" name="jetbrains.mps.lang.resources.structure.Text" flags="ng" index="1irPie">
+        <property id="2756621024541681854" name="text" index="1irPi9" />
+        <child id="1860120738943552534" name="color" index="3PKjny" />
+      </concept>
+      <concept id="2756621024541674821" name="jetbrains.mps.lang.resources.structure.TextIcon" flags="ng" index="1irR5M">
+        <property id="1358878980655415353" name="iconId" index="2$rrk2" />
+        <child id="2756621024541675110" name="layers" index="1irR9h" />
+      </concept>
+      <concept id="2756621024541675104" name="jetbrains.mps.lang.resources.structure.Circle" flags="ng" index="1irR9n" />
+      <concept id="1860120738943552477" name="jetbrains.mps.lang.resources.structure.ColorLiteral" flags="ng" index="3PKj8D">
+        <property id="1860120738943552481" name="val" index="3PKj8l" />
+      </concept>
+    </language>
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
       <concept id="3348158742936976480" name="jetbrains.mps.lang.structure.structure.EnumerationMemberDeclaration" flags="ng" index="25R33">
         <property id="1421157252384165432" name="memberId" index="3tVfz5" />
@@ -39,6 +57,7 @@
       <concept id="1071489090640" name="jetbrains.mps.lang.structure.structure.ConceptDeclaration" flags="ig" index="1TIwiD">
         <property id="1096454100552" name="rootable" index="19KtqR" />
         <reference id="1071489389519" name="extends" index="1TJDcQ" />
+        <child id="6327362524875300597" name="icon" index="rwd14" />
         <child id="1169129564478" name="implements" index="PzmwI" />
       </concept>
       <concept id="1071489288299" name="jetbrains.mps.lang.structure.structure.PropertyDeclaration" flags="ig" index="1TJgyi">
@@ -69,7 +88,7 @@
     <property role="19KtqR" value="true" />
     <property role="34LRSv" value="Plant UML Root" />
     <property role="R4oN_" value="root node containing plantuml models" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="1I7wo92VgA2" role="1TKVEi">
       <property role="IQ2ns" value="1983696557348555138" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
@@ -80,13 +99,30 @@
     <node concept="PrWs8" id="1I7wo92Vg_V" role="PzmwI">
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
     </node>
+    <node concept="1irR5M" id="75npNYZvY$2" role="rwd14">
+      <property role="2$rrk2" value="1" />
+      <node concept="1irR9n" id="75npNYZvY$5" role="1irR9h">
+        <node concept="3PKj8D" id="75npNYZvY$8" role="3PKjn_">
+          <property role="3PKj8l" value="FFFFFF" />
+        </node>
+        <node concept="3PKj8D" id="75npNYZvY$a" role="3PKjnB">
+          <property role="3PKj8l" value="AAAAAA" />
+        </node>
+      </node>
+      <node concept="1irPie" id="75npNYZvY$c" role="1irR9h">
+        <property role="1irPi9" value="U" />
+        <node concept="3PKj8D" id="75npNYZvY$f" role="3PKjny">
+          <property role="3PKj8l" value="FF0000" />
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="1TIwiD" id="1I7wo92Vg_W">
     <property role="EcuMT" value="1983696557348555132" />
     <property role="TrG5h" value="PlantUmlDiagramBase" />
     <property role="R5$K7" value="true" />
     <property role="3GE5qa" value="base" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="1I7wo92WvVQ" role="1TKVEl">
       <property role="IQ2nx" value="1983696557348880118" />
       <property role="TrG5h" value="displayStrategy" />
@@ -162,7 +198,7 @@
     <property role="TrG5h" value="PlantUmlCommandBase" />
     <property role="R5$K7" value="true" />
     <property role="3GE5qa" value="base" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="6BNnCp_tcDL" role="PzmwI">
       <ref role="PrY4T" node="1I7wo92Vg_Z" resolve="IPlantUmlDiagramContent" />
     </node>
@@ -247,7 +283,7 @@
     <property role="EcuMT" value="1983696557349277305" />
     <property role="3GE5qa" value="diagram.component" />
     <property role="TrG5h" value="ComponentRef" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="1I7wo92Y0TU" role="1TKVEi">
       <property role="IQ2ns" value="1983696557349277306" />
       <property role="20kJfa" value="component" />
@@ -262,7 +298,7 @@
     <property role="EcuMT" value="1983696557349285456" />
     <property role="3GE5qa" value="diagram.component" />
     <property role="TrG5h" value="InterfaceRef" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="1I7wo92Y2Th" role="1TKVEi">
       <property role="IQ2ns" value="1983696557349285457" />
       <property role="20kJfa" value="interf" />
@@ -455,7 +491,7 @@
     <property role="3GE5qa" value="common_commands.skinparam" />
     <property role="TrG5h" value="SkinparamParameterBase" />
     <property role="R5$K7" value="true" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
   </node>
   <node concept="1TIwiD" id="7ikA1GKsghA">
     <property role="EcuMT" value="8400506447497069670" />
@@ -590,7 +626,7 @@
     <property role="EcuMT" value="7634549724642624365" />
     <property role="3GE5qa" value="base.generic_content" />
     <property role="TrG5h" value="PlantUmlEmptyLine" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="6BNnCp_okdI" role="PzmwI">
       <ref role="PrY4T" node="6BNnCp_okdG" resolve="IPlantUmlRootContent" />
     </node>
@@ -607,7 +643,7 @@
     <property role="TrG5h" value="PlantUmlSingleLineComment" />
     <property role="34LRSv" value="'" />
     <property role="R4oN_" value="single line comment" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="6BNnCp_onx9" role="1TKVEl">
       <property role="IQ2nx" value="7634549724642637897" />
       <property role="TrG5h" value="comment" />
@@ -627,7 +663,7 @@
     <property role="EcuMT" value="7634549724643560691" />
     <property role="3GE5qa" value="diagram.usecase" />
     <property role="TrG5h" value="ActorRef" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="6BNnCp_rSNO" role="PzmwI">
       <ref role="PrY4T" node="1I7wo92Y2Ts" resolve="IChannelEndpoint" />
     </node>
@@ -642,7 +678,7 @@
     <property role="EcuMT" value="7634549724643586715" />
     <property role="3GE5qa" value="diagram.usecase" />
     <property role="TrG5h" value="UsecaseRef" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="6BNnCp_rZat" role="1TKVEi">
       <property role="IQ2ns" value="7634549724643586717" />
       <property role="20kJfa" value="usecase" />
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 e9843393d..0b903918d 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
@@ -17,6 +17,7 @@
     <dependency reexport="false">ecfb9949-7433-4db5-85de-0f84d172e4ce(de.q60.mps.collections.libs)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="2" />
@@ -68,6 +69,7 @@
     <module reference="68b16187-1d03-4fff-975a-475207b3ad31(com.cso.enabler.arch.functional)" version="0" />
     <module reference="deb4d624-41e8-4a3c-96c6-a1223f64be20(com.cso.enabler.base)" version="0" />
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="d7ce0776-e180-44b6-8b3f-a274ad438311(com.symo.sysml.ibd)" version="0" />
     <module reference="f7ad14aa-a3e2-4301-8822-d919845c8bcf(de.itemis.mps.editor.diagram.shapes)" version="0" />
     <module reference="ecfb9949-7433-4db5-85de-0f84d172e4ce(de.q60.mps.collections.libs)" 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 4deb48955..f46a87524 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
@@ -14,6 +14,7 @@
     <import index="wo6c" ref="r:de91083f-90a8-4dd4-83b1-8a92d65ab81d(de.itemis.mps.editor.diagram.shapes)" />
     <import index="4hyq" ref="r:cf2fb6e4-988a-44a1-af5e-f0f6a81c5941(com.symo.sysml.ibd.structure)" />
     <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
@@ -365,7 +366,7 @@
     <ref role="1XX52x" to="4hyq:4PDUeYRwZi5" resolve="IBDContainer" />
     <node concept="3EZMnI" id="4PDUeYRwZix" role="2wV5jI">
       <node concept="PMmxH" id="4PDUeYRwZiC" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3F2HdR" id="4PDUeYRwZiH" role="3EZMnx">
         <ref role="1NtTu8" to="4hyq:4PDUeYRwZid" resolve="content" />
@@ -552,7 +553,7 @@
       </node>
       <node concept="3F0ifn" id="4PDUeYRx2_Z" role="3EZMnx">
         <property role="3F0ifm" value=";" />
-        <ref role="1k5W1q" to="xnej:2CEi94e3iKI" resolve="PassiveTextStyle" />
+        <ref role="1k5W1q" to="1ks0:2CEi94e3iKI" resolve="PassiveTextStyle" />
       </node>
       <node concept="2iRkQZ" id="4PDUeYRx2zY" role="2iSdaV" />
     </node>
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 4bc2286bf..23ce568cb 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
@@ -84,6 +84,7 @@
     <dependency reexport="true">fa13cc63-c476-4d46-9c96-d53670abe7bc(de.itemis.mps.editor.diagram)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="1" />
@@ -132,6 +133,7 @@
     <module reference="58f09ba8-d272-44ef-a234-d73536c6b2d9(com.fasten.base.activity)" version="0" />
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="7b45fa94-2707-4a1a-9e6a-ce40c4aaf35a(de.itemis.mps.editor.collapsible.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.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 75cee1ee0..68d271cd7 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
@@ -13,6 +13,7 @@
     <import index="nkm5" ref="r:095345ad-6627-42ca-9d3f-fc1b2d9fbd61(de.itemis.mps.editor.diagram.runtime.model)" />
     <import index="fbzs" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.geom(JDK/)" />
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="1706" ref="r:ae7628a3-99c3-40af-bbb8-ad72da8dfcc8(com.fasten.base.activity.structure)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
@@ -319,7 +320,7 @@
     <node concept="3EZMnI" id="4CA5ZMJ3tsv" role="2wV5jI">
       <node concept="2iRkQZ" id="4CA5ZMJ3tsw" role="2iSdaV" />
       <node concept="PMmxH" id="4mOCK0sB6Lg" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3F0ifn" id="4CA5ZMJ6b8y" role="3EZMnx" />
       <node concept="PMmxH" id="3QO5pQQIAyd" role="3EZMnx">
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/com.fasten.base.msc.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/com.fasten.base.msc.mpl
index 0163126d8..841f1215a 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/com.fasten.base.msc.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/com.fasten.base.msc.mpl
@@ -61,6 +61,7 @@
     <dependency reexport="false">b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)</dependency>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -108,6 +109,7 @@
     <module reference="81f6a079-965e-4523-87c3-8e6194f66585(com.fasten.base.msc)" version="0" />
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/models/com.fasten.base.msc.editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/models/com.fasten.base.msc.editor.mps
index 3d3fe7d6c..792bb5f92 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/models/com.fasten.base.msc.editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/models/com.fasten.base.msc.editor.mps
@@ -19,6 +19,7 @@
     <import index="exr9" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor(MPS.Editor/)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
@@ -563,7 +564,7 @@
     <node concept="3EZMnI" id="4CA5ZMJ3tsv" role="2wV5jI">
       <node concept="2iRkQZ" id="4CA5ZMJ3tsw" role="2iSdaV" />
       <node concept="PMmxH" id="4mOCK0sB6Lg" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3F0ifn" id="4CA5ZMJ6b8y" role="3EZMnx" />
       <node concept="PMmxH" id="3QO5pQQIAyd" role="3EZMnx">
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 f94deca38..9ab906cee 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
@@ -19,6 +19,7 @@
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
@@ -76,6 +77,7 @@
     <module reference="71797868-de95-425c-8470-36aa52c8ebc4(com.mbeddr.formal.base.arch)" version="0" />
     <module reference="b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)" version="0" />
     <module reference="e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="7b45fa94-2707-4a1a-9e6a-ce40c4aaf35a(de.itemis.mps.editor.collapsible.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.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 e0b3c3630..72eb76514 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
@@ -29,6 +29,7 @@
     <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
     <import index="x4mf" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.menus(MPS.Editor/)" />
     <import index="exr9" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor(MPS.Editor/)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
@@ -579,7 +580,7 @@
             </node>
             <node concept="3F0ifn" id="67ygqsM8Nzi" role="2czzBI">
               <property role="3F0ifm" value="no input" />
-              <ref role="1k5W1q" to="xnej:67ygqsM9cDK" resolve="EditingHintStyle" />
+              <ref role="1k5W1q" to="1ks0:67ygqsM9cDK" resolve="EditingHintStyle" />
             </node>
           </node>
           <node concept="l2Vlx" id="7RhjhI7AbnM" role="2iSdaV" />
@@ -597,7 +598,7 @@
             </node>
             <node concept="3F0ifn" id="67ygqsMaaq$" role="2czzBI">
               <property role="3F0ifm" value="no output" />
-              <ref role="1k5W1q" to="xnej:67ygqsM9cDK" resolve="EditingHintStyle" />
+              <ref role="1k5W1q" to="1ks0:67ygqsM9cDK" resolve="EditingHintStyle" />
             </node>
           </node>
         </node>
@@ -626,7 +627,7 @@
             </node>
             <node concept="3F0ifn" id="67ygqsMaaqB" role="2czzBI">
               <property role="3F0ifm" value="no contract" />
-              <ref role="1k5W1q" to="xnej:67ygqsM9cDK" resolve="EditingHintStyle" />
+              <ref role="1k5W1q" to="1ks0:67ygqsM9cDK" resolve="EditingHintStyle" />
             </node>
           </node>
           <node concept="l2Vlx" id="7RhjhI7Baj$" role="2iSdaV" />
@@ -1427,7 +1428,7 @@
             </node>
             <node concept="3F0ifn" id="57ROGn8Stw6" role="2czzBI">
               <property role="3F0ifm" value="add new input" />
-              <ref role="1k5W1q" to="xnej:67ygqsM9cDK" resolve="EditingHintStyle" />
+              <ref role="1k5W1q" to="1ks0:67ygqsM9cDK" resolve="EditingHintStyle" />
             </node>
           </node>
           <node concept="3EZMnI" id="57ROGn943HX" role="3EZMnx">
@@ -1487,7 +1488,7 @@
               <node concept="2iRkQZ" id="57ROGn8Wv8Z" role="2czzBy" />
               <node concept="3F0ifn" id="_wUu$TZEUf" role="2czzBJ">
                 <property role="3F0ifm" value="no inherited inputs" />
-                <ref role="1k5W1q" to="xnej:67ygqsM9cDK" resolve="EditingHintStyle" />
+                <ref role="1k5W1q" to="1ks0:67ygqsM9cDK" resolve="EditingHintStyle" />
               </node>
             </node>
             <node concept="pkWqt" id="57ROGn944zF" role="pqm2j">
@@ -1524,7 +1525,7 @@
             </node>
             <node concept="3F0ifn" id="57ROGn8Stwd" role="2czzBI">
               <property role="3F0ifm" value="add new output" />
-              <ref role="1k5W1q" to="xnej:67ygqsM9cDK" resolve="EditingHintStyle" />
+              <ref role="1k5W1q" to="1ks0:67ygqsM9cDK" resolve="EditingHintStyle" />
             </node>
           </node>
           <node concept="3EZMnI" id="57ROGn947SV" role="3EZMnx">
@@ -1584,7 +1585,7 @@
               <node concept="2iRkQZ" id="_wUu$TZFv1" role="2czzBy" />
               <node concept="3F0ifn" id="_wUu$TZFv2" role="2czzBJ">
                 <property role="3F0ifm" value="no inherited outputs" />
-                <ref role="1k5W1q" to="xnej:67ygqsM9cDK" resolve="EditingHintStyle" />
+                <ref role="1k5W1q" to="1ks0:67ygqsM9cDK" resolve="EditingHintStyle" />
               </node>
             </node>
             <node concept="pkWqt" id="57ROGn948It" role="pqm2j">
@@ -1633,7 +1634,7 @@
             </node>
             <node concept="3F0ifn" id="6xNJt7lueN0" role="2czzBI">
               <property role="3F0ifm" value="add new contract" />
-              <ref role="1k5W1q" to="xnej:67ygqsM9cDK" resolve="EditingHintStyle" />
+              <ref role="1k5W1q" to="1ks0:67ygqsM9cDK" resolve="EditingHintStyle" />
             </node>
           </node>
           <node concept="3EZMnI" id="6xNJt7lufcD" role="3EZMnx">
@@ -1695,7 +1696,7 @@
               </node>
               <node concept="3F0ifn" id="6xNJt7lufd3" role="2czzBJ">
                 <property role="3F0ifm" value="no inherited contracts" />
-                <ref role="1k5W1q" to="xnej:67ygqsM9cDK" resolve="EditingHintStyle" />
+                <ref role="1k5W1q" to="1ks0:67ygqsM9cDK" resolve="EditingHintStyle" />
               </node>
               <node concept="2iRkQZ" id="5WRxR_T2a5V" role="2czzBy" />
             </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/com.mbeddr.formal.base.expressions.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/com.mbeddr.formal.base.expressions.mpl
index e3c96376b..c20bbf6cd 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/com.mbeddr.formal.base.expressions.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/com.mbeddr.formal.base.expressions.mpl
@@ -19,6 +19,7 @@
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="2" />
@@ -76,6 +77,7 @@
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />
     <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/editor.mps
index 7cf7352eb..daaeab41a 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/editor.mps
@@ -11,6 +11,7 @@
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="ehqg" ref="r:2c1724e1-8ed6-4fe4-9e44-fae13cd2a5ac(com.mbeddr.formal.base.expressions.structure)" />
     <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="ox2v" ref="r:9d0d3f45-3600-4f52-892b-d59f24c624ff(com.mbeddr.formal.base.expressions.behavior)" implicit="true" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
@@ -264,7 +265,7 @@
         </node>
         <node concept="3F0ifn" id="3_qrK00j4t$" role="3EZMnx">
           <property role="3F0ifm" value="(" />
-          <ref role="1k5W1q" to="xnej:2CEi94dh36z" resolve="ParensStyle" />
+          <ref role="1k5W1q" to="1ks0:2CEi94dh36z" resolve="ParensStyle" />
           <node concept="pkWqt" id="3_qrK00j4t_" role="pqm2j">
             <node concept="3clFbS" id="3_qrK00j4tA" role="2VODD2">
               <node concept="3clFbF" id="3_qrK00j4tB" role="3cqZAp">
@@ -328,7 +329,7 @@
         </node>
         <node concept="3F0ifn" id="3_qrK00jd$Z" role="3EZMnx">
           <property role="3F0ifm" value=")" />
-          <ref role="1k5W1q" to="xnej:2CEi94dh36z" resolve="ParensStyle" />
+          <ref role="1k5W1q" to="1ks0:2CEi94dh36z" resolve="ParensStyle" />
           <node concept="pkWqt" id="3_qrK00jd_0" role="pqm2j">
             <node concept="3clFbS" id="3_qrK00jd_1" role="2VODD2">
               <node concept="3clFbF" id="3_qrK00jd_2" role="3cqZAp">
@@ -369,7 +370,7 @@
         </node>
         <node concept="3F0ifn" id="3_qrK00jd_d" role="3EZMnx">
           <property role="3F0ifm" value="(" />
-          <ref role="1k5W1q" to="xnej:2CEi94dh36z" resolve="ParensStyle" />
+          <ref role="1k5W1q" to="1ks0:2CEi94dh36z" resolve="ParensStyle" />
           <node concept="11LMrY" id="3_qrK00jd_e" role="3F10Kt">
             <property role="VOm3f" value="true" />
           </node>
@@ -450,7 +451,7 @@
         </node>
         <node concept="3F0ifn" id="3_qrK00j4ux" role="3EZMnx">
           <property role="3F0ifm" value=")" />
-          <ref role="1k5W1q" to="xnej:2CEi94dh36z" resolve="ParensStyle" />
+          <ref role="1k5W1q" to="1ks0:2CEi94dh36z" resolve="ParensStyle" />
           <node concept="pkWqt" id="3_qrK00j4uy" role="pqm2j">
             <node concept="3clFbS" id="3_qrK00j4uz" role="2VODD2">
               <node concept="3clFbF" id="3_qrK00j4u$" role="3cqZAp">
@@ -524,7 +525,7 @@
         <node concept="1kIj98" id="1Ia5rYltMfn" role="3EZMnx">
           <node concept="2lNzut" id="D5oLwMtubt" role="1kIj9b">
             <ref role="1NtTu8" to="ehqg:6NmtaR20s4L" resolve="value" />
-            <ref role="1k5W1q" to="xnej:2CEi94dgUHC" resolve="NumberStyle" />
+            <ref role="1k5W1q" to="1ks0:2CEi94dgUHC" resolve="NumberStyle" />
             <node concept="bYqod" id="D5oLwMT$B9" role="2lD6_D" />
           </node>
         </node>
@@ -547,14 +548,14 @@
       <node concept="drBAd" id="2uT2PLmVWIE" role="1LiK7o">
         <node concept="3F0ifn" id="2uT2PLmVWIG" role="drBAZ">
           <property role="3F0ifm" value=")" />
-          <ref role="1k5W1q" to="xnej:2CEi94dh36z" resolve="ParensStyle" />
+          <ref role="1k5W1q" to="1ks0:2CEi94dh36z" resolve="ParensStyle" />
           <node concept="11L4FC" id="2uT2PLmVWLw" role="3F10Kt">
             <property role="VOm3f" value="true" />
           </node>
         </node>
         <node concept="3F0ifn" id="2uT2PLmVWII" role="drBA7">
           <property role="3F0ifm" value="(" />
-          <ref role="1k5W1q" to="xnej:2CEi94dh36z" resolve="ParensStyle" />
+          <ref role="1k5W1q" to="1ks0:2CEi94dh36z" resolve="ParensStyle" />
           <node concept="11LMrY" id="2uT2PLmVWO7" role="3F10Kt">
             <property role="VOm3f" value="true" />
           </node>
@@ -613,7 +614,7 @@
     <ref role="1XX52x" to="ehqg:7mSH3Wn6oBK" resolve="BooleanLiteral" />
     <node concept="PMmxH" id="7mSH3Wn6XrB" role="2wV5jI">
       <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-      <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+      <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
     </node>
   </node>
   <node concept="24kQdi" id="6mm$FLYVIZK">
@@ -669,7 +670,7 @@
     <ref role="1XX52x" to="ehqg:6NmtaR1SV7a" resolve="Type" />
     <node concept="PMmxH" id="5mKzygLVYol" role="2wV5jI">
       <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-      <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+      <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
     </node>
   </node>
   <node concept="2$ogZn" id="5bMrXoEyj8A">
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/com.mbeddr.formal.base.operatorspanel.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/com.mbeddr.formal.base.operatorspanel.mpl
index fee7aed38..11b4af127 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/com.mbeddr.formal.base.operatorspanel.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/com.mbeddr.formal.base.operatorspanel.mpl
@@ -17,6 +17,7 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="true">4bf9a860-39c9-4cb2-8004-157a961bf42c(com.mbeddr.formal.base.operatorspanel.rt)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
@@ -75,6 +76,7 @@
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="3fb92f6f-450c-4e41-8129-97a4b9978951(com.mbeddr.formal.base.operatorspanel)" version="0" />
     <module reference="4bf9a860-39c9-4cb2-8004-157a961bf42c(com.mbeddr.formal.base.operatorspanel.rt)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/models/editor.mps
index 428d5b171..374cbdb0b 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/models/editor.mps
@@ -31,6 +31,7 @@
     <import index="zhty" ref="4bf9a860-39c9-4cb2-8004-157a961bf42c/java:org.jfree.data.general(com.mbeddr.formal.base.operatorspanel.rt/)" />
     <import index="8en7" ref="4bf9a860-39c9-4cb2-8004-157a961bf42c/java:org.jfree.data.xy(com.mbeddr.formal.base.operatorspanel.rt/)" />
     <import index="teca" ref="4bf9a860-39c9-4cb2-8004-157a961bf42c/java:org.jfree.chart.renderer.xy(com.mbeddr.formal.base.operatorspanel.rt/)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="6m3u" ref="r:67761219-191d-44af-aaf0-3da2d685817e(com.mbeddr.formal.base.operatorspanel.behavior)" implicit="true" />
   </imports>
@@ -607,7 +608,7 @@
           <property role="VOm3f" value="false" />
         </node>
         <node concept="PMmxH" id="4xJapKM67gV" role="3EZMnx">
-          <ref role="PMmxG" to="xnej:4xJapKM66o$" resolve="iconAndNameCell" />
+          <ref role="PMmxG" to="1ks0:4xJapKM66o$" resolve="iconAndNameCell" />
         </node>
         <node concept="l2Vlx" id="2mjHtwTQKh5" role="2iSdaV" />
       </node>
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 2980aa608..6a4bbe198 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
@@ -28,6 +28,7 @@
     <dependency reexport="false">8da51702-0e05-44c8-96db-8f11d1457c0c(com.mpsbasics.snode.utils)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
     <dependency reexport="false">1f4710e9-f074-4732-a0bd-6fa896d282b7(com.mpsbasics.project.utils)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:120e1c9d-4e27-4478-b2af-b2c3bd3850b0:com.mbeddr.mpsutil.editor.querylist" version="0" />
@@ -89,6 +90,7 @@
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="1f4710e9-f074-4732-a0bd-6fa896d282b7(com.mpsbasics.project.utils)" version="0" />
     <module reference="8da51702-0e05-44c8-96db-8f11d1457c0c(com.mpsbasics.snode.utils)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.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 4ae3d5e1a..97a14852e 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
@@ -44,6 +44,7 @@
     <import index="orxl" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing.plaf(JDK/)" />
     <import index="lzb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui(MPS.IDEA/)" />
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
@@ -83,7 +84,6 @@
       <concept id="3308309804690746362" name="jetbrains.mps.lang.editor.structure.QueryFunction_ColorComposit" flags="ig" index="mot77" />
       <concept id="1142886221719" name="jetbrains.mps.lang.editor.structure.QueryFunction_NodeCondition" flags="in" index="pkWqt" />
       <concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
-      <concept id="1237385578942" name="jetbrains.mps.lang.editor.structure.IndentLayoutOnNewLineStyleClassItem" flags="ln" index="pVoyu" />
       <concept id="4242538589859161874" name="jetbrains.mps.lang.editor.structure.ExplicitHintsSpecification" flags="ng" index="2w$q5c">
         <child id="4242538589859162459" name="hints" index="2w$qW5" />
       </concept>
@@ -143,9 +143,6 @@
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
       <concept id="1214406454886" name="jetbrains.mps.lang.editor.structure.TextBackgroundColorStyleClassItem" flags="ln" index="30gYXW" />
-      <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
-      <concept id="1233759184865" name="jetbrains.mps.lang.editor.structure.PunctuationRightStyleClassItem" flags="ln" index="11LMrY" />
-      <concept id="1240253180846" name="jetbrains.mps.lang.editor.structure.IndentLayoutNoWrapClassItem" flags="ln" index="34QqEe" />
       <concept id="3383245079137382180" name="jetbrains.mps.lang.editor.structure.StyleClass" flags="ig" index="14StLt" />
       <concept id="3360401466585705291" name="jetbrains.mps.lang.editor.structure.CellModel_ContextAssistant" flags="ng" index="18a60v" />
       <concept id="1221057094638" name="jetbrains.mps.lang.editor.structure.QueryFunction_Integer" flags="in" index="1cFabM" />
@@ -176,9 +173,6 @@
       <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
-      <concept id="1236262245656" name="jetbrains.mps.lang.editor.structure.MatchingLabelStyleClassItem" flags="ln" index="3mYdg7">
-        <property id="1238091709220" name="labelName" index="1413C4" />
-      </concept>
       <concept id="1165420413719" name="jetbrains.mps.lang.editor.structure.CellMenuPart_Generic_Group" flags="ng" index="1ou48o">
         <child id="1165420413721" name="handlerFunction" index="1ou48m" />
         <child id="1165420413720" name="parametersFunction" index="1ou48n" />
@@ -262,9 +256,6 @@
       </concept>
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
-      <concept id="1179360813171" name="jetbrains.mps.baseLanguage.structure.HexIntegerLiteral" flags="nn" index="2nou5x">
-        <property id="1179360856892" name="value" index="2noCCI" />
-      </concept>
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
@@ -313,10 +304,7 @@
         <child id="1070534934091" name="type" index="10QFUM" />
         <child id="1070534934092" name="expression" index="10QFUP" />
       </concept>
-      <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg">
-        <property id="8606350594693632173" name="isTransient" index="eg7rD" />
-        <property id="1240249534625" name="isVolatile" index="34CwA1" />
-      </concept>
+      <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
         <child id="1165602531693" name="superclass" index="1zkMxy" />
       </concept>
@@ -402,7 +390,6 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
@@ -532,643 +519,6 @@
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
   </registry>
-  <node concept="312cEu" id="4tRpPVPUEa3">
-    <property role="TrG5h" value="BasicColors" />
-    <node concept="3Tm1VV" id="4tRpPVPUEa4" role="1B3o_S" />
-    <node concept="Wx3nA" id="4tRpPVPUEa5" role="jymVt">
-      <property role="TrG5h" value="COMMENT_GREEN" />
-      <node concept="3Tm1VV" id="4tRpPVPUEpv" role="1B3o_S" />
-      <node concept="3uibUv" id="4tRpPVPUEac" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="2ShNRf" id="4tRpPVPUEae" role="33vP2m">
-        <node concept="1pGfFk" id="4tRpPVPUEaf" role="2ShVmc">
-          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
-          <node concept="3cmrfG" id="4tRpPVPUEag" role="37wK5m">
-            <property role="3cmrfH" value="14" />
-          </node>
-          <node concept="3cmrfG" id="4tRpPVPUEai" role="37wK5m">
-            <property role="3cmrfH" value="117" />
-          </node>
-          <node concept="3cmrfG" id="4tRpPVPUEp9" role="37wK5m">
-            <property role="3cmrfH" value="35" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="Wx3nA" id="4tRpPVPUEpG" role="jymVt">
-      <property role="TrG5h" value="TODO_BLUE" />
-      <node concept="3Tm1VV" id="4tRpPVPUEpH" role="1B3o_S" />
-      <node concept="3uibUv" id="4tRpPVPUEpI" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="2ShNRf" id="4tRpPVPUEpJ" role="33vP2m">
-        <node concept="1pGfFk" id="4tRpPVPUEpK" role="2ShVmc">
-          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
-          <node concept="3cmrfG" id="4tRpPVPUEpL" role="37wK5m">
-            <property role="3cmrfH" value="15" />
-          </node>
-          <node concept="3cmrfG" id="4tRpPVPUEpM" role="37wK5m">
-            <property role="3cmrfH" value="32" />
-          </node>
-          <node concept="3cmrfG" id="4tRpPVPUEpN" role="37wK5m">
-            <property role="3cmrfH" value="219" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="y826GFznfV" role="jymVt" />
-    <node concept="Wx3nA" id="2CEi94dud1E" role="jymVt">
-      <property role="TrG5h" value="COMMENT_GREY" />
-      <node concept="3Tm1VV" id="2CEi94dud1F" role="1B3o_S" />
-      <node concept="3uibUv" id="2CEi94dud1G" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="2ShNRf" id="2CEi94dud1H" role="33vP2m">
-        <node concept="1pGfFk" id="2CEi94dud1I" role="2ShVmc">
-          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
-          <node concept="2nou5x" id="y826GFznhq" role="37wK5m">
-            <property role="2noCCI" value="80" />
-          </node>
-          <node concept="2nou5x" id="y826GFznsv" role="37wK5m">
-            <property role="2noCCI" value="80" />
-          </node>
-          <node concept="2nou5x" id="y826GFznut" role="37wK5m">
-            <property role="2noCCI" value="80" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="Wx3nA" id="2CEi94emCnI" role="jymVt">
-      <property role="TrG5h" value="KEYWORD_BLUE" />
-      <node concept="3Tm1VV" id="2CEi94emCnJ" role="1B3o_S" />
-      <node concept="3uibUv" id="2CEi94emCnK" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="2ShNRf" id="5v_KyvNS5Np" role="33vP2m">
-        <node concept="1pGfFk" id="5v_KyvNSrAx" role="2ShVmc">
-          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
-          <node concept="3cmrfG" id="5v_KyvNSrBc" role="37wK5m">
-            <property role="3cmrfH" value="0" />
-          </node>
-          <node concept="3cmrfG" id="5v_KyvNSrT4" role="37wK5m">
-            <property role="3cmrfH" value="0" />
-          </node>
-          <node concept="2nou5x" id="5v_KyvNSsd_" role="37wK5m">
-            <property role="2noCCI" value="80" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="Wx3nA" id="3Q78AXIZrq" role="jymVt">
-      <property role="TrG5h" value="KEYWORD_LIGHT_BLUE" />
-      <node concept="3Tm1VV" id="3Q78AXIZrr" role="1B3o_S" />
-      <node concept="3uibUv" id="3Q78AXIZrs" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="2ShNRf" id="3Q78AXIZrt" role="33vP2m">
-        <node concept="1pGfFk" id="3Q78AXIZru" role="2ShVmc">
-          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
-          <node concept="3cmrfG" id="3Q78AXIZrv" role="37wK5m">
-            <property role="3cmrfH" value="0" />
-          </node>
-          <node concept="3cmrfG" id="3Q78AXIZrw" role="37wK5m">
-            <property role="3cmrfH" value="210" />
-          </node>
-          <node concept="3cmrfG" id="3Q78AXJbUG" role="37wK5m">
-            <property role="3cmrfH" value="255" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="Wx3nA" id="KwKRgpJugV" role="jymVt">
-      <property role="TrG5h" value="KEYWORD_DARK_BLUE" />
-      <node concept="3Tm1VV" id="KwKRgpJugW" role="1B3o_S" />
-      <node concept="3uibUv" id="KwKRgpJugX" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="2ShNRf" id="KwKRgpJugY" role="33vP2m">
-        <node concept="1pGfFk" id="KwKRgpJugZ" role="2ShVmc">
-          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
-          <node concept="3cmrfG" id="KwKRgpJuh0" role="37wK5m">
-            <property role="3cmrfH" value="0" />
-          </node>
-          <node concept="2nou5x" id="KwKRgpNzg$" role="37wK5m">
-            <property role="2noCCI" value="30" />
-          </node>
-          <node concept="2nou5x" id="KwKRgpJuh2" role="37wK5m">
-            <property role="2noCCI" value="80" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4afdSTbPIoh" role="jymVt" />
-    <node concept="Wx3nA" id="4afdSTbPIhl" role="jymVt">
-      <property role="TrG5h" value="KEYWORD_GREEN_DARK" />
-      <node concept="3Tm1VV" id="4afdSTbPIhm" role="1B3o_S" />
-      <node concept="3uibUv" id="4afdSTbPIhn" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="2YIFZM" id="42Yf_hF11Mi" role="33vP2m">
-        <ref role="37wK5l" to="z60i:~Color.decode(java.lang.String)" resolve="decode" />
-        <ref role="1Pybhc" to="z60i:~Color" resolve="Color" />
-        <node concept="Xl_RD" id="42Yf_hF11Mj" role="37wK5m">
-          <property role="Xl_RC" value="#01C60B" />
-        </node>
-      </node>
-    </node>
-    <node concept="Wx3nA" id="4afdSTbQoB4" role="jymVt">
-      <property role="TrG5h" value="KEYWORD_GREEN_LIGHT" />
-      <node concept="3Tm1VV" id="4afdSTbQoB5" role="1B3o_S" />
-      <node concept="3uibUv" id="4afdSTbQoB6" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="2YIFZM" id="42Yf_hF11Md" role="33vP2m">
-        <ref role="1Pybhc" to="z60i:~Color" resolve="Color" />
-        <ref role="37wK5l" to="z60i:~Color.decode(java.lang.String)" resolve="decode" />
-        <node concept="Xl_RD" id="42Yf_hF11Me" role="37wK5m">
-          <property role="Xl_RC" value="#017507" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="KwKRgpJueU" role="jymVt" />
-    <node concept="2tJIrI" id="4afdSTbPIfQ" role="jymVt" />
-    <node concept="Wx3nA" id="y826GEUxbz" role="jymVt">
-      <property role="TrG5h" value="INACTIVE" />
-      <node concept="3Tm1VV" id="y826GEUxb$" role="1B3o_S" />
-      <node concept="3uibUv" id="y826GEUxb_" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="10M0yZ" id="y826GEUBj_" role="33vP2m">
-        <ref role="1PxDUh" to="z60i:~Color" resolve="Color" />
-        <ref role="3cqZAo" to="z60i:~Color.GRAY" resolve="GRAY" />
-      </node>
-    </node>
-    <node concept="Wx3nA" id="y826GFqdaI" role="jymVt">
-      <property role="TrG5h" value="STRING" />
-      <node concept="3Tm1VV" id="y826GFqdaJ" role="1B3o_S" />
-      <node concept="3uibUv" id="y826GFqdaK" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="2ShNRf" id="y826GFvxvw" role="33vP2m">
-        <node concept="1pGfFk" id="y826GFvTJ$" role="2ShVmc">
-          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
-          <node concept="3cmrfG" id="y826GFvTKd" role="37wK5m">
-            <property role="3cmrfH" value="0" />
-          </node>
-          <node concept="2nou5x" id="y826GFzn4Q" role="37wK5m">
-            <property role="2noCCI" value="80" />
-          </node>
-          <node concept="3cmrfG" id="y826GFvUwq" role="37wK5m">
-            <property role="3cmrfH" value="0" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="Wx3nA" id="y826GHHfBE" role="jymVt">
-      <property role="TrG5h" value="METADATA" />
-      <node concept="3Tm1VV" id="y826GHHfBF" role="1B3o_S" />
-      <node concept="3uibUv" id="y826GHHfBG" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="2ShNRf" id="y826GHHfBH" role="33vP2m">
-        <node concept="1pGfFk" id="y826GHHfBI" role="2ShVmc">
-          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
-          <node concept="2nou5x" id="y826GHHCHq" role="37wK5m">
-            <property role="2noCCI" value="80" />
-          </node>
-          <node concept="2nou5x" id="y826GHHfBK" role="37wK5m">
-            <property role="2noCCI" value="80" />
-          </node>
-          <node concept="3cmrfG" id="y826GHHfBL" role="37wK5m">
-            <property role="3cmrfH" value="0" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2CEi94dud0W" role="jymVt" />
-  </node>
-  <node concept="312cEu" id="DubiFB4e4O">
-    <property role="TrG5h" value="IconCell" />
-    <property role="3GE5qa" value="cells.other" />
-    <node concept="2tJIrI" id="xsq72MHxwy" role="jymVt" />
-    <node concept="3Tm1VV" id="DubiFB4e4P" role="1B3o_S" />
-    <node concept="3uibUv" id="DubiFB4e4Q" role="1zkMxy">
-      <ref role="3uigEE" to="exr9:~AbstractCellProvider" resolve="AbstractCellProvider" />
-    </node>
-    <node concept="312cEg" id="DubiFB4e4R" role="jymVt">
-      <property role="TrG5h" value="myNode" />
-      <property role="3TUv4t" value="true" />
-      <node concept="3Tm6S6" id="DubiFB4e4S" role="1B3o_S" />
-      <node concept="3Tqbb2" id="DubiFB4e4T" role="1tU5fm" />
-    </node>
-    <node concept="312cEg" id="DubiFBVAkw" role="jymVt">
-      <property role="TrG5h" value="voffset" />
-      <property role="3TUv4t" value="true" />
-      <node concept="3Tm6S6" id="DubiFBVAkx" role="1B3o_S" />
-      <node concept="10Oyi0" id="DubiFBVAkz" role="1tU5fm" />
-    </node>
-    <node concept="3clFbW" id="DubiFB4e4X" role="jymVt">
-      <node concept="3cqZAl" id="DubiFB4e4Y" role="3clF45" />
-      <node concept="3Tm1VV" id="DubiFB4e4Z" role="1B3o_S" />
-      <node concept="3clFbS" id="DubiFB4e50" role="3clF47">
-        <node concept="XkiVB" id="6V6nHEzQ9uz" role="3cqZAp">
-          <ref role="37wK5l" to="exr9:~AbstractCellProvider.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNode)" resolve="AbstractCellProvider" />
-          <node concept="37vLTw" id="6V6nHEzQ9C2" role="37wK5m">
-            <ref role="3cqZAo" node="DubiFB4e57" resolve="node" />
-          </node>
-        </node>
-        <node concept="3clFbF" id="DubiFB4e51" role="3cqZAp">
-          <node concept="37vLTI" id="DubiFB4e52" role="3clFbG">
-            <node concept="37vLTw" id="DubiFB4e53" role="37vLTx">
-              <ref role="3cqZAo" node="DubiFB4e57" resolve="node" />
-            </node>
-            <node concept="2OqwBi" id="DubiFB4e54" role="37vLTJ">
-              <node concept="Xjq3P" id="DubiFB4e55" role="2Oq$k0" />
-              <node concept="2OwXpG" id="DubiFB4e56" role="2OqNvi">
-                <ref role="2Oxat5" node="DubiFB4e4R" resolve="myNode" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="DubiFBVAk$" role="3cqZAp">
-          <node concept="37vLTI" id="DubiFBVAkA" role="3clFbG">
-            <node concept="2OqwBi" id="DubiFBVAkE" role="37vLTJ">
-              <node concept="Xjq3P" id="DubiFBVAkH" role="2Oq$k0" />
-              <node concept="2OwXpG" id="DubiFBVAkD" role="2OqNvi">
-                <ref role="2Oxat5" node="DubiFBVAkw" resolve="voffset" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="DubiFBVAkI" role="37vLTx">
-              <ref role="3cqZAo" node="DubiFBVzl1" resolve="voffset" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="DubiFB4e57" role="3clF46">
-        <property role="TrG5h" value="node" />
-        <node concept="3Tqbb2" id="DubiFB4e58" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="DubiFBVzl1" role="3clF46">
-        <property role="TrG5h" value="voffset" />
-        <node concept="10Oyi0" id="DubiFBVzwF" role="1tU5fm" />
-      </node>
-    </node>
-    <node concept="3clFb_" id="DubiFB4e5t" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="createEditorCell" />
-      <property role="DiZV1" value="false" />
-      <node concept="3Tm1VV" id="DubiFB4e5u" role="1B3o_S" />
-      <node concept="3uibUv" id="DubiFB4e5v" role="3clF45">
-        <ref role="3uigEE" to="g51k:~EditorCell" resolve="EditorCell" />
-      </node>
-      <node concept="37vLTG" id="DubiFB4e5w" role="3clF46">
-        <property role="TrG5h" value="context" />
-        <node concept="3uibUv" id="7XIXMBMXeR9" role="1tU5fm">
-          <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="DubiFB4e5y" role="3clF47">
-        <node concept="3cpWs6" id="DubiFB4e7p" role="3cqZAp">
-          <node concept="2ShNRf" id="1dVWdop08sE" role="3cqZAk">
-            <node concept="1pGfFk" id="1dVWdop08sF" role="2ShVmc">
-              <ref role="37wK5l" node="1dVWdooZXce" resolve="IconCell.MyEditorCell_Basic" />
-              <node concept="37vLTw" id="1dVWdop08sG" role="37wK5m">
-                <ref role="3cqZAo" node="DubiFB4e5w" resolve="context" />
-              </node>
-              <node concept="2OqwBi" id="1dVWdop08sH" role="37wK5m">
-                <node concept="2OwXpG" id="1dVWdop08sI" role="2OqNvi">
-                  <ref role="2Oxat5" node="DubiFB4e4R" resolve="myNode" />
-                </node>
-                <node concept="Xjq3P" id="1dVWdop08sJ" role="2Oq$k0" />
-              </node>
-              <node concept="37vLTw" id="1dVWdop08sK" role="37wK5m">
-                <ref role="3cqZAo" node="DubiFB4e5w" resolve="context" />
-              </node>
-              <node concept="37vLTw" id="1dVWdop08sL" role="37wK5m">
-                <ref role="3cqZAo" node="DubiFBVAkw" resolve="voffset" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1dVWdop01TR" role="jymVt" />
-    <node concept="312cEu" id="1dVWdooZXca" role="jymVt">
-      <property role="TrG5h" value="MyEditorCell_Basic" />
-      <property role="2bfB8j" value="true" />
-      <node concept="312cEg" id="DubiFB6mE3" role="jymVt">
-        <property role="34CwA1" value="false" />
-        <property role="eg7rD" value="false" />
-        <property role="TrG5h" value="icon" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3Tm6S6" id="DubiFB6lCh" role="1B3o_S" />
-        <node concept="3uibUv" id="DubiFB6mCz" role="1tU5fm">
-          <ref role="3uigEE" to="dxuu:~Icon" resolve="Icon" />
-        </node>
-      </node>
-      <node concept="312cEg" id="1dVWdop04xK" role="jymVt">
-        <property role="TrG5h" value="voffset" />
-        <node concept="3Tm6S6" id="1dVWdop04xL" role="1B3o_S" />
-        <node concept="10Oyi0" id="1dVWdop04xN" role="1tU5fm" />
-      </node>
-      <node concept="2tJIrI" id="1dVWdooZZi5" role="jymVt" />
-      <node concept="3clFbW" id="1dVWdooZXce" role="jymVt">
-        <node concept="3clFbS" id="1dVWdooZXcf" role="3clF47">
-          <node concept="XkiVB" id="1dVWdooZXck" role="3cqZAp">
-            <ref role="37wK5l" to="g51k:~EditorCell_Basic.&lt;init&gt;(jetbrains.mps.openapi.editor.EditorContext,org.jetbrains.mps.openapi.model.SNode)" resolve="EditorCell_Basic" />
-            <node concept="37vLTw" id="1dVWdooZXci" role="37wK5m">
-              <ref role="3cqZAo" node="1dVWdooZXc5" resolve="p0" />
-            </node>
-            <node concept="37vLTw" id="1dVWdooZXcj" role="37wK5m">
-              <ref role="3cqZAo" node="1dVWdooZXc8" resolve="node" />
-            </node>
-          </node>
-          <node concept="3clFbF" id="DubiFB6nGu" role="3cqZAp">
-            <node concept="37vLTI" id="DubiFB6pof" role="3clFbG">
-              <node concept="2OqwBi" id="DubiFB6nJd" role="37vLTJ">
-                <node concept="Xjq3P" id="DubiFB6nGs" role="2Oq$k0" />
-                <node concept="2OwXpG" id="DubiFB6oOs" role="2OqNvi">
-                  <ref role="2Oxat5" node="DubiFB6mE3" resolve="icon" />
-                </node>
-              </node>
-              <node concept="2OqwBi" id="1vcsY82Hn7h" role="37vLTx">
-                <node concept="liA8E" id="1vcsY82HoX$" role="2OqNvi">
-                  <ref role="37wK5l" to="sn11:192HKKPOd3m" resolve="getIconFor" />
-                  <node concept="37vLTw" id="1vcsY82HpvB" role="37wK5m">
-                    <ref role="3cqZAo" node="1dVWdooZXc8" resolve="node" />
-                  </node>
-                </node>
-                <node concept="2YIFZM" id="1vcsY82Hovy" role="2Oq$k0">
-                  <ref role="37wK5l" to="sn11:5UC$YgehaLf" resolve="getInstance" />
-                  <ref role="1Pybhc" to="sn11:192HKKPMXeL" resolve="GlobalIconManager" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="1dVWdop04xO" role="3cqZAp">
-            <node concept="37vLTI" id="1dVWdop04xQ" role="3clFbG">
-              <node concept="2OqwBi" id="1dVWdop04xU" role="37vLTJ">
-                <node concept="Xjq3P" id="1dVWdop04xX" role="2Oq$k0" />
-                <node concept="2OwXpG" id="1dVWdop04xT" role="2OqNvi">
-                  <ref role="2Oxat5" node="1dVWdop04xK" resolve="voffset" />
-                </node>
-              </node>
-              <node concept="37vLTw" id="1dVWdop04xY" role="37vLTx">
-                <ref role="3cqZAo" node="1dVWdop03ru" resolve="voffset" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3Tm1VV" id="1dVWdooZXcg" role="1B3o_S" />
-        <node concept="3cqZAl" id="1dVWdooZXch" role="3clF45" />
-        <node concept="37vLTG" id="1dVWdooZXc5" role="3clF46">
-          <property role="TrG5h" value="p0" />
-          <node concept="3uibUv" id="1dVWdooZXc6" role="1tU5fm">
-            <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
-          </node>
-          <node concept="2AHcQZ" id="1dVWdooZXc7" role="2AJF6D">
-            <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="1dVWdooZXc8" role="3clF46">
-          <property role="TrG5h" value="node" />
-          <node concept="3uibUv" id="1dVWdooZXc9" role="1tU5fm">
-            <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="1dVWdooZXc3" role="3clF46">
-          <property role="TrG5h" value="context" />
-          <node concept="3uibUv" id="1dVWdooZXc4" role="1tU5fm">
-            <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="1dVWdop03ru" role="3clF46">
-          <property role="TrG5h" value="voffset" />
-          <node concept="10Oyi0" id="1dVWdop03ET" role="1tU5fm" />
-        </node>
-      </node>
-      <node concept="3Tm6S6" id="1dVWdooZXcc" role="1B3o_S" />
-      <node concept="2tJIrI" id="1dVWdop06ml" role="jymVt" />
-      <node concept="3clFb_" id="DubiFB4e5I" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="paintContent" />
-        <node concept="3Tm1VV" id="DubiFB4e5J" role="1B3o_S" />
-        <node concept="3cqZAl" id="DubiFB4e5K" role="3clF45" />
-        <node concept="37vLTG" id="DubiFB4e5L" role="3clF46">
-          <property role="TrG5h" value="g" />
-          <node concept="3uibUv" id="DubiFB4e5M" role="1tU5fm">
-            <ref role="3uigEE" to="z60i:~Graphics" resolve="Graphics" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="DubiFB4e5N" role="3clF46">
-          <property role="TrG5h" value="parentSettings" />
-          <node concept="3uibUv" id="DubiFB4e5O" role="1tU5fm">
-            <ref role="3uigEE" to="g51k:~ParentSettings" resolve="ParentSettings" />
-          </node>
-        </node>
-        <node concept="3clFbS" id="DubiFB4e5P" role="3clF47">
-          <node concept="3cpWs8" id="DubiFB6sMC" role="3cqZAp">
-            <node concept="3cpWsn" id="DubiFB6sMD" role="3cpWs9">
-              <property role="TrG5h" value="img" />
-              <node concept="3uibUv" id="DubiFB6sME" role="1tU5fm">
-                <ref role="3uigEE" to="jan3:~BufferedImage" resolve="BufferedImage" />
-              </node>
-              <node concept="2ShNRf" id="DubiFB6tmq" role="33vP2m">
-                <node concept="1pGfFk" id="DubiFB6tmp" role="2ShVmc">
-                  <ref role="37wK5l" to="jan3:~BufferedImage.&lt;init&gt;(int,int,int)" resolve="BufferedImage" />
-                  <node concept="2OqwBi" id="DubiFB6uDp" role="37wK5m">
-                    <node concept="37vLTw" id="DubiFB6u_7" role="2Oq$k0">
-                      <ref role="3cqZAo" node="DubiFB6mE3" resolve="icon" />
-                    </node>
-                    <node concept="liA8E" id="DubiFB6va8" role="2OqNvi">
-                      <ref role="37wK5l" to="dxuu:~Icon.getIconWidth()" resolve="getIconWidth" />
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="DubiFB6wes" role="37wK5m">
-                    <node concept="37vLTw" id="DubiFB6vHc" role="2Oq$k0">
-                      <ref role="3cqZAo" node="DubiFB6mE3" resolve="icon" />
-                    </node>
-                    <node concept="liA8E" id="DubiFB6wKk" role="2OqNvi">
-                      <ref role="37wK5l" to="dxuu:~Icon.getIconHeight()" resolve="getIconHeight" />
-                    </node>
-                  </node>
-                  <node concept="10M0yZ" id="DubiFB6y4t" role="37wK5m">
-                    <ref role="3cqZAo" to="jan3:~BufferedImage.TYPE_INT_ARGB" resolve="TYPE_INT_ARGB" />
-                    <ref role="1PxDUh" to="jan3:~BufferedImage" resolve="BufferedImage" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="DubiFB6ABN" role="3cqZAp">
-            <node concept="2OqwBi" id="DubiFB6B8g" role="3clFbG">
-              <node concept="37vLTw" id="DubiFB6ABM" role="2Oq$k0">
-                <ref role="3cqZAo" node="DubiFB6mE3" resolve="icon" />
-              </node>
-              <node concept="liA8E" id="DubiFB6BHb" role="2OqNvi">
-                <ref role="37wK5l" to="dxuu:~Icon.paintIcon(java.awt.Component,java.awt.Graphics,int,int)" resolve="paintIcon" />
-                <node concept="10Nm6u" id="DubiFB6CUl" role="37wK5m" />
-                <node concept="2OqwBi" id="DubiFB6Dvd" role="37wK5m">
-                  <node concept="37vLTw" id="DubiFB6CXV" role="2Oq$k0">
-                    <ref role="3cqZAo" node="DubiFB6sMD" resolve="img" />
-                  </node>
-                  <node concept="liA8E" id="DubiFB6F_a" role="2OqNvi">
-                    <ref role="37wK5l" to="jan3:~BufferedImage.getGraphics()" resolve="getGraphics" />
-                  </node>
-                </node>
-                <node concept="3cmrfG" id="DubiFB6GS1" role="37wK5m">
-                  <property role="3cmrfH" value="0" />
-                </node>
-                <node concept="3cmrfG" id="DubiFB6GUS" role="37wK5m">
-                  <property role="3cmrfH" value="0" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWs8" id="DubiFBOoku" role="3cqZAp">
-            <node concept="3cpWsn" id="DubiFBOokv" role="3cpWs9">
-              <property role="TrG5h" value="parent" />
-              <node concept="3uibUv" id="DubiFBOokw" role="1tU5fm">
-                <ref role="3uigEE" to="g51k:~EditorCell_Collection" resolve="EditorCell_Collection" />
-              </node>
-              <node concept="2OqwBi" id="DubiFBOokx" role="33vP2m">
-                <node concept="liA8E" id="DubiFBOoky" role="2OqNvi">
-                  <ref role="37wK5l" to="g51k:~EditorCell_Basic.getParent()" resolve="getParent" />
-                </node>
-                <node concept="Xjq3P" id="DubiFBOokz" role="2Oq$k0" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="DubiFB5RoN" role="3cqZAp">
-            <node concept="2OqwBi" id="DubiFB5Rq9" role="3clFbG">
-              <node concept="37vLTw" id="DubiFB5RoM" role="2Oq$k0">
-                <ref role="3cqZAo" node="DubiFB4e5L" resolve="g" />
-              </node>
-              <node concept="liA8E" id="DubiFB5RUO" role="2OqNvi">
-                <ref role="37wK5l" to="z60i:~Graphics.drawImage(java.awt.Image,int,int,java.awt.image.ImageObserver)" resolve="drawImage" />
-                <node concept="37vLTw" id="DubiFB6_ih" role="37wK5m">
-                  <ref role="3cqZAo" node="DubiFB6sMD" resolve="img" />
-                </node>
-                <node concept="2OqwBi" id="DubiFBOsU5" role="37wK5m">
-                  <node concept="37vLTw" id="DubiFBOrMY" role="2Oq$k0">
-                    <ref role="3cqZAo" node="DubiFBOokv" resolve="parent" />
-                  </node>
-                  <node concept="liA8E" id="DubiFBOxB5" role="2OqNvi">
-                    <ref role="37wK5l" to="g51k:~EditorCell_Basic.getX()" resolve="getX" />
-                  </node>
-                </node>
-                <node concept="3cpWs3" id="DubiFBSgqw" role="37wK5m">
-                  <node concept="37vLTw" id="1dVWdop07lB" role="3uHU7w">
-                    <ref role="3cqZAo" node="1dVWdop04xK" resolve="voffset" />
-                  </node>
-                  <node concept="2OqwBi" id="DubiFBO$o2" role="3uHU7B">
-                    <node concept="37vLTw" id="DubiFBOz49" role="2Oq$k0">
-                      <ref role="3cqZAo" node="DubiFBOokv" resolve="parent" />
-                    </node>
-                    <node concept="liA8E" id="DubiFBOCoH" role="2OqNvi">
-                      <ref role="37wK5l" to="g51k:~EditorCell_Basic.getY()" resolve="getY" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="10Nm6u" id="DubiFB6btx" role="37wK5m" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="1dVWdop0649" role="jymVt" />
-      <node concept="3clFb_" id="DubiFB4e73" role="jymVt">
-        <property role="TrG5h" value="relayoutImpl" />
-        <node concept="3cqZAl" id="DubiFB4e74" role="3clF45" />
-        <node concept="3Tm1VV" id="DubiFB4e75" role="1B3o_S" />
-        <node concept="3clFbS" id="DubiFB4e76" role="3clF47">
-          <node concept="3clFbF" id="DubiFB4e77" role="3cqZAp">
-            <node concept="37vLTI" id="DubiFB4e78" role="3clFbG">
-              <node concept="2OqwBi" id="DubiFB6K4D" role="37vLTx">
-                <node concept="37vLTw" id="DubiFB6Juc" role="2Oq$k0">
-                  <ref role="3cqZAo" node="DubiFB6mE3" resolve="icon" />
-                </node>
-                <node concept="liA8E" id="DubiFB6KUs" role="2OqNvi">
-                  <ref role="37wK5l" to="dxuu:~Icon.getIconWidth()" resolve="getIconWidth" />
-                </node>
-              </node>
-              <node concept="2OqwBi" id="DubiFB4e7a" role="37vLTJ">
-                <node concept="2OwXpG" id="DubiFB4e7b" role="2OqNvi">
-                  <ref role="2Oxat5" to="g51k:~EditorCell_Basic.myWidth" resolve="myWidth" />
-                </node>
-                <node concept="Xjq3P" id="DubiFB4e7c" role="2Oq$k0" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="DubiFB4e7d" role="3cqZAp">
-            <node concept="37vLTI" id="DubiFB4e7e" role="3clFbG">
-              <node concept="2OqwBi" id="DubiFB4e7f" role="37vLTJ">
-                <node concept="2OwXpG" id="DubiFB4e7g" role="2OqNvi">
-                  <ref role="2Oxat5" to="g51k:~EditorCell_Basic.myHeight" resolve="myHeight" />
-                </node>
-                <node concept="Xjq3P" id="DubiFB4e7h" role="2Oq$k0" />
-              </node>
-              <node concept="2OqwBi" id="DubiFB6Mb8" role="37vLTx">
-                <node concept="37vLTw" id="DubiFB6LS_" role="2Oq$k0">
-                  <ref role="3cqZAo" node="DubiFB6mE3" resolve="icon" />
-                </node>
-                <node concept="liA8E" id="DubiFB6N8I" role="2OqNvi">
-                  <ref role="37wK5l" to="dxuu:~Icon.getIconHeight()" resolve="getIconHeight" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="1dVWdop05KZ" role="jymVt" />
-      <node concept="3clFb_" id="DubiFB4e7j" role="jymVt">
-        <property role="TrG5h" value="isLastCaretPosition" />
-        <node concept="10P_77" id="DubiFB4e7k" role="3clF45" />
-        <node concept="3Tm1VV" id="DubiFB4e7l" role="1B3o_S" />
-        <node concept="3clFbS" id="DubiFB4e7m" role="3clF47">
-          <node concept="3cpWs6" id="DubiFB4e7n" role="3cqZAp">
-            <node concept="3clFbT" id="DubiFB4e7o" role="3cqZAk">
-              <property role="3clFbU" value="true" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="1dVWdooZXcd" role="1zkMxy">
-        <ref role="3uigEE" to="g51k:~EditorCell_Basic" resolve="EditorCell_Basic" />
-      </node>
-    </node>
-  </node>
-  <node concept="PKFIW" id="4xJapKM66o$">
-    <property role="TrG5h" value="iconAndNameCell" />
-    <ref role="1XX52x" to="tpck:h0TrEE$" resolve="INamedConcept" />
-    <node concept="3EZMnI" id="6NmtaR1SUJL" role="2wV5jI">
-      <node concept="VPM3Z" id="6NmtaR1SUJN" role="3F10Kt">
-        <property role="VOm3f" value="false" />
-      </node>
-      <node concept="gc7cB" id="14CuINs5Us6" role="3EZMnx">
-        <node concept="3VJUX4" id="14CuINs5Us8" role="3YsKMw">
-          <node concept="3clFbS" id="14CuINs5Usa" role="2VODD2">
-            <node concept="3clFbF" id="14CuINs5Uvr" role="3cqZAp">
-              <node concept="2ShNRf" id="14CuINs5Uvp" role="3clFbG">
-                <node concept="1pGfFk" id="14CuINs5UTp" role="2ShVmc">
-                  <ref role="37wK5l" node="DubiFB4e4X" resolve="IconCell" />
-                  <node concept="pncrf" id="14CuINs5UXj" role="37wK5m" />
-                  <node concept="3cmrfG" id="14CuINs5Vdl" role="37wK5m">
-                    <property role="3cmrfH" value="3" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3F0A7n" id="6NmtaR1SUKu" role="3EZMnx">
-        <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-      </node>
-      <node concept="l2Vlx" id="6NmtaR1SUJQ" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="312cEu" id="1LnB5xduXHY">
     <property role="TrG5h" value="ColoredVerticalBarCell" />
     <property role="3GE5qa" value="cells.other" />
@@ -2016,13 +1366,13 @@
                 <node concept="1pGfFk" id="8xY_IhAaBa" role="2ShVmc">
                   <property role="373rjd" value="true" />
                   <ref role="37wK5l" to="18ew:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
-                  <node concept="10M0yZ" id="8xY_IhAaKd" role="37wK5m">
-                    <ref role="3cqZAo" node="2CEi94emCnI" resolve="KEYWORD_BLUE" />
-                    <ref role="1PxDUh" node="4tRpPVPUEa3" resolve="BasicColors" />
+                  <node concept="10M0yZ" id="4lJSf3Lk2jB" role="37wK5m">
+                    <ref role="3cqZAo" to="1ks0:2CEi94emCnI" resolve="KEYWORD_BLUE" />
+                    <ref role="1PxDUh" to="1ks0:4tRpPVPUEa3" resolve="BasicColors" />
                   </node>
-                  <node concept="10M0yZ" id="4afdSTbQY$w" role="37wK5m">
-                    <ref role="3cqZAo" node="4afdSTbQoB4" resolve="KEYWORD_GREEN_LIGHT" />
-                    <ref role="1PxDUh" node="4tRpPVPUEa3" resolve="BasicColors" />
+                  <node concept="10M0yZ" id="4lJSf3Lk2jG" role="37wK5m">
+                    <ref role="3cqZAo" to="1ks0:4afdSTbQoB4" resolve="KEYWORD_GREEN_LIGHT" />
+                    <ref role="1PxDUh" to="1ks0:4tRpPVPUEa3" resolve="BasicColors" />
                   </node>
                 </node>
               </node>
@@ -2044,13 +1394,13 @@
                 <node concept="1pGfFk" id="8xY_IhAb73" role="2ShVmc">
                   <property role="373rjd" value="true" />
                   <ref role="37wK5l" to="18ew:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
-                  <node concept="10M0yZ" id="8xY_IhAbbz" role="37wK5m">
-                    <ref role="3cqZAo" node="KwKRgpJugV" resolve="KEYWORD_DARK_BLUE" />
-                    <ref role="1PxDUh" node="4tRpPVPUEa3" resolve="BasicColors" />
+                  <node concept="10M0yZ" id="4lJSf3Lk2jF" role="37wK5m">
+                    <ref role="3cqZAo" to="1ks0:KwKRgpJugV" resolve="KEYWORD_DARK_BLUE" />
+                    <ref role="1PxDUh" to="1ks0:4tRpPVPUEa3" resolve="BasicColors" />
                   </node>
-                  <node concept="10M0yZ" id="3Q78AXJuEw" role="37wK5m">
-                    <ref role="3cqZAo" node="3Q78AXIZrq" resolve="KEYWORD_LIGHT_BLUE" />
-                    <ref role="1PxDUh" node="4tRpPVPUEa3" resolve="BasicColors" />
+                  <node concept="10M0yZ" id="4lJSf3Lk2jE" role="37wK5m">
+                    <ref role="3cqZAo" to="1ks0:3Q78AXIZrq" resolve="KEYWORD_LIGHT_BLUE" />
+                    <ref role="1PxDUh" to="1ks0:4tRpPVPUEa3" resolve="BasicColors" />
                   </node>
                 </node>
               </node>
@@ -3321,81 +2671,6 @@
     </node>
     <node concept="2tJIrI" id="6Kf5KB7dzfv" role="jymVt" />
   </node>
-  <node concept="PKFIW" id="4_pH3zvd_oC">
-    <property role="TrG5h" value="horizontalLine" />
-    <ref role="1XX52x" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="gc7cB" id="14CuINs2S1v" role="2wV5jI">
-      <node concept="3VJUX4" id="14CuINs2S1x" role="3YsKMw">
-        <node concept="3clFbS" id="14CuINs2S1z" role="2VODD2">
-          <node concept="3clFbF" id="14CuINs3AmH" role="3cqZAp">
-            <node concept="2ShNRf" id="14CuINs3AmD" role="3clFbG">
-              <node concept="YeOm9" id="14CuINs3ALc" role="2ShVmc">
-                <node concept="1Y3b0j" id="14CuINs3ALf" role="YeSDq">
-                  <property role="2bfB8j" value="true" />
-                  <ref role="1Y3XeK" to="exr9:~AbstractCellProvider" resolve="AbstractCellProvider" />
-                  <ref role="37wK5l" to="exr9:~AbstractCellProvider.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNode)" resolve="AbstractCellProvider" />
-                  <node concept="3Tm1VV" id="14CuINs3ALg" role="1B3o_S" />
-                  <node concept="3clFb_" id="14CuINs3ALh" role="jymVt">
-                    <property role="1EzhhJ" value="false" />
-                    <property role="TrG5h" value="createEditorCell" />
-                    <property role="DiZV1" value="false" />
-                    <property role="od$2w" value="false" />
-                    <node concept="3Tm1VV" id="14CuINs3ALi" role="1B3o_S" />
-                    <node concept="3uibUv" id="14CuINs3ALk" role="3clF45">
-                      <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-                    </node>
-                    <node concept="37vLTG" id="14CuINs3ALl" role="3clF46">
-                      <property role="TrG5h" value="p0" />
-                      <node concept="3uibUv" id="14CuINs3ALm" role="1tU5fm">
-                        <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
-                      </node>
-                    </node>
-                    <node concept="3clFbS" id="14CuINs3ALn" role="3clF47">
-                      <node concept="3cpWs8" id="14CuINs3prj" role="3cqZAp">
-                        <node concept="3cpWsn" id="14CuINs3prk" role="3cpWs9">
-                          <property role="TrG5h" value="hlc" />
-                          <node concept="3uibUv" id="14CuINs3prf" role="1tU5fm">
-                            <ref role="3uigEE" to="mc8f:4U82Y3yZDCl" resolve="HorizontalLineCell" />
-                          </node>
-                          <node concept="2ShNRf" id="14CuINs3prl" role="33vP2m">
-                            <node concept="1pGfFk" id="14CuINs3prm" role="2ShVmc">
-                              <ref role="37wK5l" to="mc8f:4U82Y3yZF0a" resolve="HorizontalLineCell" />
-                              <node concept="1Q80Hx" id="14CuINs3prn" role="37wK5m" />
-                              <node concept="pncrf" id="14CuINs3pro" role="37wK5m" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbF" id="14CuINs2S6p" role="3cqZAp">
-                        <node concept="2OqwBi" id="14CuINs3$ju" role="3clFbG">
-                          <node concept="37vLTw" id="14CuINs3prp" role="2Oq$k0">
-                            <ref role="3cqZAo" node="14CuINs3prk" resolve="hlc" />
-                          </node>
-                          <node concept="liA8E" id="14CuINs3DJ7" role="2OqNvi">
-                            <ref role="37wK5l" to="mc8f:4U82Y3yZLMv" resolve="setColor" />
-                            <node concept="10M0yZ" id="14CuINs3GGP" role="37wK5m">
-                              <ref role="1PxDUh" node="4tRpPVPUEa3" resolve="BasicColors" />
-                              <ref role="3cqZAo" node="2CEi94emCnI" resolve="KEYWORD_BLUE" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbF" id="14CuINs3Gwq" role="3cqZAp">
-                        <node concept="37vLTw" id="14CuINs3Gwo" role="3clFbG">
-                          <ref role="3cqZAo" node="14CuINs3prk" resolve="hlc" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="pncrf" id="14CuINs3He0" role="37wK5m" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="24kQdi" id="1ZejHLlWBZz">
     <ref role="1XX52x" to="b19z:1ZejHLlWBZ2" resolve="IArbitraryText" />
     <node concept="3EZMnI" id="1ZejHLlWBZI" role="2wV5jI">
@@ -3535,208 +2810,6 @@
       </node>
     </node>
   </node>
-  <node concept="PKFIW" id="4gtLUSMLjsp">
-    <property role="TrG5h" value="HeaderComponent" />
-    <ref role="1XX52x" to="tpck:h0TrEE$" resolve="INamedConcept" />
-    <node concept="3EZMnI" id="6NmtaR1SUJu" role="2wV5jI">
-      <node concept="3EZMnI" id="4gtLUSMLjsW" role="3EZMnx">
-        <node concept="VPM3Z" id="4gtLUSMLjsX" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="PMmxH" id="4xJapKM67gV" role="3EZMnx">
-          <ref role="PMmxG" node="4xJapKM66o$" resolve="iconAndNameCell" />
-        </node>
-        <node concept="l2Vlx" id="4gtLUSMLjsY" role="2iSdaV" />
-      </node>
-      <node concept="2iRkQZ" id="6NmtaR1SUJx" role="2iSdaV" />
-      <node concept="3EZMnI" id="3r83Ks0gb4c" role="3EZMnx">
-        <node concept="l2Vlx" id="3r83Ks0gb4d" role="2iSdaV" />
-        <node concept="3F0ifn" id="3r83Ks0gb4e" role="3EZMnx">
-          <property role="3F0ifm" value="model  " />
-          <ref role="1k5W1q" node="2CEi94e3iKI" resolve="PassiveTextStyle" />
-          <node concept="VPM3Z" id="3r83Ks0gyrX" role="3F10Kt">
-            <property role="VOm3f" value="false" />
-          </node>
-        </node>
-        <node concept="1HlG4h" id="3r83Ks0gb4f" role="3EZMnx">
-          <ref role="1k5W1q" node="2CEi94e3iKI" resolve="PassiveTextStyle" />
-          <node concept="1HfYo3" id="3r83Ks0gb4g" role="1HlULh">
-            <node concept="3TQlhw" id="3r83Ks0gb4h" role="1Hhtcw">
-              <node concept="3clFbS" id="3r83Ks0gb4i" role="2VODD2">
-                <node concept="3clFbF" id="3r83Ks0gb4E" role="3cqZAp">
-                  <node concept="2OqwBi" id="7RhjhI6ZvcJ" role="3clFbG">
-                    <node concept="2OqwBi" id="7RhjhI6Zu9J" role="2Oq$k0">
-                      <node concept="2JrnkZ" id="5Hxjapwed34" role="2Oq$k0">
-                        <node concept="2OqwBi" id="5Hxjapwed35" role="2JrQYb">
-                          <node concept="pncrf" id="5Hxjapwed36" role="2Oq$k0" />
-                          <node concept="I4A8Y" id="5Hxjapwed37" role="2OqNvi" />
-                        </node>
-                      </node>
-                      <node concept="liA8E" id="7RhjhI6ZuQR" role="2OqNvi">
-                        <ref role="37wK5l" to="mhbf:~SModel.getName()" resolve="getName" />
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="7RhjhI6ZvXf" role="2OqNvi">
-                      <ref role="37wK5l" to="mhbf:~SModelName.getLongName()" resolve="getLongName" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="11LMrY" id="3r83Ks0gb4u" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-          <node concept="VPM3Z" id="7Ua2xCXxDA6" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-        </node>
-        <node concept="pVoyu" id="3r83Ks0gb4v" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="3EZMnI" id="3r83Ks0g7Sk" role="3EZMnx">
-        <node concept="l2Vlx" id="3r83Ks0g7Sl" role="2iSdaV" />
-        <node concept="3F0ifn" id="3r83Ks0gb4b" role="3EZMnx">
-          <property role="3F0ifm" value="package" />
-          <ref role="1k5W1q" node="2CEi94e3iKI" resolve="PassiveTextStyle" />
-          <node concept="VPM3Z" id="3r83Ks0gyrW" role="3F10Kt">
-            <property role="VOm3f" value="false" />
-          </node>
-        </node>
-        <node concept="1HlG4h" id="6GZLGDRsw6C" role="3EZMnx">
-          <ref role="1k5W1q" node="2CEi94e3iKI" resolve="PassiveTextStyle" />
-          <node concept="1HfYo3" id="6GZLGDRsw6D" role="1HlULh">
-            <node concept="3TQlhw" id="6GZLGDRsw6E" role="1Hhtcw">
-              <node concept="3clFbS" id="6GZLGDRsw6F" role="2VODD2">
-                <node concept="3clFbF" id="6GZLGDRsw6J" role="3cqZAp">
-                  <node concept="3K4zz7" id="6GZLGDRsw8g" role="3clFbG">
-                    <node concept="2OqwBi" id="6GZLGDRsw8D" role="3K4E3e">
-                      <node concept="pncrf" id="6GZLGDRsw8k" role="2Oq$k0" />
-                      <node concept="3TrcHB" id="6GZLGDRsw8J" role="2OqNvi">
-                        <ref role="3TsBF5" to="tpck:hnGE5uv" resolve="virtualPackage" />
-                      </node>
-                    </node>
-                    <node concept="Xl_RD" id="6GZLGDRsw99" role="3K4GZi">
-                      <property role="Xl_RC" value="" />
-                    </node>
-                    <node concept="3y3z36" id="6GZLGDRsw7S" role="3K4Cdx">
-                      <node concept="10Nm6u" id="6GZLGDRsw7V" role="3uHU7w" />
-                      <node concept="2OqwBi" id="6GZLGDRsw77" role="3uHU7B">
-                        <node concept="pncrf" id="6GZLGDRsw6M" role="2Oq$k0" />
-                        <node concept="3TrcHB" id="6GZLGDRsw7d" role="2OqNvi">
-                          <ref role="3TsBF5" to="tpck:hnGE5uv" resolve="virtualPackage" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="11LMrY" id="6GZLGDRsw6G" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-        </node>
-        <node concept="pVoyu" id="3r83Ks0g7Sp" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="pkWqt" id="3r83Ks0g8eZ" role="pqm2j">
-          <node concept="3clFbS" id="3r83Ks0g8f0" role="2VODD2">
-            <node concept="3clFbF" id="3r83Ks0g8f1" role="3cqZAp">
-              <node concept="3y3z36" id="3r83Ks0g8fN" role="3clFbG">
-                <node concept="10Nm6u" id="3r83Ks0g8fQ" role="3uHU7w" />
-                <node concept="2OqwBi" id="3r83Ks0g8fn" role="3uHU7B">
-                  <node concept="pncrf" id="3r83Ks0g8f2" role="2Oq$k0" />
-                  <node concept="3TrcHB" id="3r83Ks0g8ft" role="2OqNvi">
-                    <ref role="3TsBF5" to="tpck:hnGE5uv" resolve="virtualPackage" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3F0ifn" id="6NmtaR1SUKE" role="3EZMnx" />
-      <node concept="PMmxH" id="4_pH3zvdAeV" role="3EZMnx">
-        <ref role="PMmxG" node="4_pH3zvd_oC" resolve="horizontalLine" />
-      </node>
-      <node concept="3F0ifn" id="14CuINs4Qgl" role="3EZMnx" />
-    </node>
-  </node>
-  <node concept="V5hpn" id="6NmtaR1SVqz">
-    <property role="TrG5h" value="basic_formal_styles" />
-    <node concept="14StLt" id="6NmtaR1SVrw" role="V601i">
-      <property role="TrG5h" value="KeywordStyle" />
-      <node concept="Vb9p2" id="6NmtaR1SWf7" role="3F10Kt">
-        <property role="Vbekb" value="g1_k_vY/BOLD" />
-      </node>
-      <node concept="VechU" id="6NmtaR1SWfp" role="3F10Kt">
-        <property role="Vb096" value="g1_eI4o/darkBlue" />
-      </node>
-    </node>
-    <node concept="14StLt" id="2CEi94dh36z" role="V601i">
-      <property role="TrG5h" value="ParensStyle" />
-      <node concept="3mYdg7" id="2CEi94dh36$" role="3F10Kt">
-        <property role="1413C4" value="parenthesis" />
-      </node>
-      <node concept="34QqEe" id="2CEi94dhicm" role="3F10Kt">
-        <property role="VOm3f" value="true" />
-      </node>
-      <node concept="Vb9p2" id="2CEi94dhicz" role="3F10Kt" />
-      <node concept="11L4FC" id="6UJZwEqlSvq" role="3F10Kt">
-        <property role="VOm3f" value="true" />
-      </node>
-    </node>
-    <node concept="14StLt" id="hFDgi_W" role="V601i">
-      <property role="TrG5h" value="Semicolon" />
-      <node concept="VPxyj" id="hZKAF6K" role="3F10Kt" />
-      <node concept="11L4FC" id="hX5Crjo" role="3F10Kt">
-        <property role="VOm3f" value="true" />
-      </node>
-      <node concept="34QqEe" id="3yOl4C1pxqc" role="3F10Kt">
-        <property role="VOm3f" value="true" />
-      </node>
-      <node concept="Vb9p2" id="1l_ZFOWqvCI" role="3F10Kt" />
-    </node>
-    <node concept="14StLt" id="2CEi94dgUHC" role="V601i">
-      <property role="TrG5h" value="NumberStyle" />
-      <node concept="VechU" id="2CEi94dgUHD" role="3F10Kt">
-        <property role="Vb096" value="6cZGtrcKCoS/black" />
-        <node concept="1iSF2X" id="2CEi94dgUHE" role="VblUZ">
-          <property role="1iTho6" value="0000FF" />
-        </node>
-      </node>
-      <node concept="Vb9p2" id="2CEi94dgUHF" role="3F10Kt" />
-    </node>
-    <node concept="14StLt" id="y826GHffn9" role="V601i">
-      <property role="TrG5h" value="OpStyle" />
-      <node concept="VechU" id="y826GHffoW" role="3F10Kt">
-        <property role="Vb096" value="6cZGtrcKCoS/black" />
-      </node>
-      <node concept="Vb9p2" id="y826GHffoY" role="3F10Kt" />
-    </node>
-    <node concept="14StLt" id="2CEi94e3iKI" role="V601i">
-      <property role="TrG5h" value="PassiveTextStyle" />
-      <node concept="VPxyj" id="2CEi94dUSQp" role="3F10Kt">
-        <property role="VOm3f" value="false" />
-      </node>
-      <node concept="Vb9p2" id="2CEi94e7jvE" role="3F10Kt" />
-      <node concept="VechU" id="2CEi94dZG7m" role="3F10Kt">
-        <property role="Vb096" value="fLJRk5B/darkGray" />
-      </node>
-    </node>
-    <node concept="14StLt" id="67ygqsM9cDK" role="V601i">
-      <property role="TrG5h" value="EditingHintStyle" />
-      <node concept="VPxyj" id="67ygqsM9cDL" role="3F10Kt" />
-      <node concept="Vb9p2" id="67ygqsM9cDM" role="3F10Kt">
-        <property role="Vbekb" value="g1_kEg4/ITALIC" />
-      </node>
-      <node concept="VechU" id="67ygqsM9cDN" role="3F10Kt">
-        <property role="Vb096" value="fLJRk5A/lightGray" />
-      </node>
-    </node>
-  </node>
   <node concept="PKFIW" id="4qaoH_GDoF">
     <property role="TrG5h" value="iconCell_" />
     <ref role="1XX52x" to="tpck:gw2VY9q" resolve="BaseConcept" />
@@ -3746,7 +2819,7 @@
           <node concept="3clFbF" id="4qaoH_GE4a" role="3cqZAp">
             <node concept="2ShNRf" id="4qaoH_GE48" role="3clFbG">
               <node concept="1pGfFk" id="4qaoH_GSV1" role="2ShVmc">
-                <ref role="37wK5l" node="DubiFB4e4X" resolve="IconCell" />
+                <ref role="37wK5l" to="1ks0:DubiFB4e4X" resolve="IconCell" />
                 <node concept="pncrf" id="4qaoH_GSZ0" role="37wK5m" />
                 <node concept="3cmrfG" id="4qaoH_GTjS" role="37wK5m">
                   <property role="3cmrfH" value="3" />
@@ -4288,7 +3361,7 @@
       <node concept="2iRfu4" id="3cGyC6fC1qR" role="2iSdaV" />
       <node concept="3F0ifn" id="3Px2xUV4muj" role="3EZMnx">
         <property role="3F0ifm" value=";" />
-        <ref role="1k5W1q" node="hFDgi_W" resolve="Semicolon" />
+        <ref role="1k5W1q" to="1ks0:hFDgi_W" resolve="Semicolon" />
       </node>
     </node>
   </node>
@@ -4466,13 +3539,13 @@
                 <node concept="1pGfFk" id="4I1OjAqvci9" role="2ShVmc">
                   <property role="373rjd" value="true" />
                   <ref role="37wK5l" to="18ew:~Pair.&lt;init&gt;(java.lang.Object,java.lang.Object)" resolve="Pair" />
-                  <node concept="10M0yZ" id="4I1OjAqvnog" role="37wK5m">
-                    <ref role="3cqZAo" node="2CEi94emCnI" resolve="KEYWORD_BLUE" />
-                    <ref role="1PxDUh" node="4tRpPVPUEa3" resolve="BasicColors" />
+                  <node concept="10M0yZ" id="4lJSf3Lk2jC" role="37wK5m">
+                    <ref role="3cqZAo" to="1ks0:2CEi94emCnI" resolve="KEYWORD_BLUE" />
+                    <ref role="1PxDUh" to="1ks0:4tRpPVPUEa3" resolve="BasicColors" />
                   </node>
-                  <node concept="10M0yZ" id="4afdSTbQp0P" role="37wK5m">
-                    <ref role="3cqZAo" node="4afdSTbQoB4" resolve="KEYWORD_GREEN_LIGHT" />
-                    <ref role="1PxDUh" node="4tRpPVPUEa3" resolve="BasicColors" />
+                  <node concept="10M0yZ" id="4lJSf3Lk2jH" role="37wK5m">
+                    <ref role="3cqZAo" to="1ks0:4afdSTbQoB4" resolve="KEYWORD_GREEN_LIGHT" />
+                    <ref role="1PxDUh" to="1ks0:4tRpPVPUEa3" resolve="BasicColors" />
                   </node>
                 </node>
               </node>
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 df4bbd6a8..08645f8c9 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
@@ -83,6 +83,7 @@
     <dependency reexport="false">450c81f1-1811-41ac-a9c8-8fda59f778ca(com.mbeddr.formal.nusmv.tabular)</dependency>
     <dependency reexport="false">9d368018-badb-4569-9884-4b463e4f6696(de.slisson.mps.conditionalEditor.runtime)</dependency>
     <dependency reexport="false">8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
@@ -153,6 +154,7 @@
     <module reference="001b2375-3bd5-4d5e-9958-6b3f62dc8548(com.mbeddr.formal.nusmv)" version="0" />
     <module reference="22a84bd5-d947-48ae-b9f6-8288eea41dce(com.mbeddr.formal.nusmv.arch)" version="0" />
     <module reference="450c81f1-1811-41ac-a9c8-8fda59f778ca(com.mbeddr.formal.nusmv.tabular)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="7b45fa94-2707-4a1a-9e6a-ce40c4aaf35a(de.itemis.mps.editor.collapsible.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.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 1c1105360..33e34baf7 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
@@ -36,6 +36,7 @@
     <import index="wfnd" ref="r:5f5edb09-c9b1-47da-a374-00a0a908694a(com.mbeddr.formal.base.arch.editor)" />
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
     <import index="sn11" ref="r:836426ab-a6f4-4fa3-9a9c-34c02ed6ab5d(jetbrains.mps.ide.icons)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="irze" ref="r:afe10199-b53f-473f-86e1-bb9b9bb07417(com.mbeddr.formal.nusmv.arch.behavior)" implicit="true" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" implicit="true" />
   </imports>
@@ -3118,7 +3119,7 @@
             <node concept="238au4" id="5sbrvaMhQu0" role="23bJyd">
               <node concept="3F0ifn" id="5sbrvaMhUa9" role="2wV5jI">
                 <property role="3F0ifm" value="TRUE" />
-                <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+                <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
               </node>
             </node>
             <node concept="3Tqbb2" id="5sbrvaMhQYE" role="2M4AHM">
@@ -3168,7 +3169,7 @@
             <node concept="238au4" id="2zzTeYigHNS" role="23bJyd">
               <node concept="3F0ifn" id="2zzTeYigHNT" role="2wV5jI">
                 <property role="3F0ifm" value="FALSE" />
-                <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+                <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
               </node>
             </node>
             <node concept="3Tqbb2" id="2zzTeYigHNU" role="2M4AHM">
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/com.mbeddr.formal.nusmv.operatorspanel.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/com.mbeddr.formal.nusmv.operatorspanel.mpl
index e069ea0d7..6fa4be206 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/com.mbeddr.formal.nusmv.operatorspanel.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/com.mbeddr.formal.nusmv.operatorspanel.mpl
@@ -18,6 +18,7 @@
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">735f86bc-17fb-4d1c-a664-82c2b8e8a34e(com.mbeddr.mpsutil.interpreter.rt)</dependency>
     <dependency reexport="false">b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:47f075a6-558e-4640-a606-7ce0236c8023:com.mbeddr.mpsutil.interpreter" version="1" />
@@ -84,6 +85,7 @@
     <module reference="2dd5dace-06d5-4283-a878-7272f2df6d4b(com.mbeddr.formal.nusmv.operatorspanel)" version="0" />
     <module reference="735f86bc-17fb-4d1c-a664-82c2b8e8a34e(com.mbeddr.mpsutil.interpreter.rt)" version="0" />
     <module reference="726886d1-ef90-4249-a08f-1e3ec23a7113(com.mbeddr.mpsutil.traceExplorer)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/models/editor.mps
index 601527ecc..c97ef7108 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/models/editor.mps
@@ -7,6 +7,7 @@
   </languages>
   <imports>
     <import index="ula4" ref="r:d3a814d2-9602-4041-8e3a-b08bde780524(com.mbeddr.formal.nusmv.operatorspanel.structure)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" implicit="true" />
   </imports>
@@ -111,7 +112,7 @@
         </node>
         <node concept="3F0ifn" id="1l_ZFOWquha" role="3EZMnx">
           <property role="3F0ifm" value="(" />
-          <ref role="1k5W1q" to="xnej:2CEi94dh36z" resolve="ParensStyle" />
+          <ref role="1k5W1q" to="1ks0:2CEi94dh36z" resolve="ParensStyle" />
           <node concept="11LMrY" id="6UJZwEqm8nF" role="3F10Kt">
             <property role="VOm3f" value="true" />
           </node>
@@ -122,7 +123,7 @@
         </node>
         <node concept="3F0ifn" id="1l_ZFOWqu71" role="3EZMnx">
           <property role="3F0ifm" value=")" />
-          <ref role="1k5W1q" to="xnej:2CEi94dh36z" resolve="ParensStyle" />
+          <ref role="1k5W1q" to="1ks0:2CEi94dh36z" resolve="ParensStyle" />
         </node>
         <node concept="3F0ifn" id="1l_ZFOWqu7b" role="3EZMnx">
           <property role="3F0ifm" value="{" />
@@ -151,7 +152,7 @@
       </node>
       <node concept="3F0ifn" id="1l_ZFOWquhD" role="3EZMnx">
         <property role="3F0ifm" value="(" />
-        <ref role="1k5W1q" to="xnej:2CEi94dh36z" resolve="ParensStyle" />
+        <ref role="1k5W1q" to="1ks0:2CEi94dh36z" resolve="ParensStyle" />
         <node concept="11LMrY" id="6UJZwEqmFAj" role="3F10Kt">
           <property role="VOm3f" value="true" />
         </node>
@@ -161,7 +162,7 @@
       </node>
       <node concept="3F0ifn" id="1l_ZFOWqui0" role="3EZMnx">
         <property role="3F0ifm" value=")" />
-        <ref role="1k5W1q" to="xnej:2CEi94dh36z" resolve="ParensStyle" />
+        <ref role="1k5W1q" to="1ks0:2CEi94dh36z" resolve="ParensStyle" />
       </node>
       <node concept="2iRfu4" id="1l_ZFOWquhv" role="2iSdaV" />
     </node>
@@ -189,7 +190,7 @@
       </node>
       <node concept="3F0ifn" id="1l_ZFOWquji" role="3EZMnx">
         <property role="3F0ifm" value=";" />
-        <ref role="1k5W1q" to="xnej:hFDgi_W" resolve="Semicolon" />
+        <ref role="1k5W1q" to="1ks0:hFDgi_W" resolve="Semicolon" />
       </node>
       <node concept="l2Vlx" id="1l_ZFOWquiN" role="2iSdaV" />
     </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/com.mbeddr.formal.nusmv.source.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/com.mbeddr.formal.nusmv.source.mpl
index 1a526f843..f81cc3065 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/com.mbeddr.formal.nusmv.source.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/com.mbeddr.formal.nusmv.source.mpl
@@ -16,6 +16,7 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -72,6 +73,7 @@
     <module reference="b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)" version="0" />
     <module reference="001b2375-3bd5-4d5e-9958-6b3f62dc8548(com.mbeddr.formal.nusmv)" version="0" />
     <module reference="bf72618c-958a-47f5-9aac-3eff98d79ffd(com.mbeddr.formal.nusmv.source)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/models/editor.mps
index ce4314182..ae91728a4 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/models/editor.mps
@@ -11,6 +11,7 @@
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
     <import index="unno" ref="r:61e3d524-8c49-4491-b5e3-f6d6e9364527(jetbrains.mps.util)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
@@ -98,7 +99,7 @@
     <node concept="3EZMnI" id="6glUKoNPfWh" role="2wV5jI">
       <node concept="2iRkQZ" id="6glUKoNPfWi" role="2iSdaV" />
       <node concept="PMmxH" id="4gtLUSMLpyr" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3F2HdR" id="6glUKoNLIpu" role="3EZMnx">
         <ref role="1NtTu8" to="rcfd:6glUKoNLInE" resolve="content" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/com.mbeddr.formal.nusmv.tests.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/com.mbeddr.formal.nusmv.tests.mpl
index 387ce8e6f..cfc782262 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/com.mbeddr.formal.nusmv.tests.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/com.mbeddr.formal.nusmv.tests.mpl
@@ -81,6 +81,7 @@
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">692c2a6d-09c5-40f7-98f0-1f4b59860c1b(com.mbeddr.formal.nusmv.pluginSolution)</dependency>
     <dependency reexport="false">e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f89904fb-9486-43a1-865e-5ad0375a8a88:de.itemis.mps.editor.bool" version="0" />
@@ -147,6 +148,7 @@
     <module reference="692c2a6d-09c5-40f7-98f0-1f4b59860c1b(com.mbeddr.formal.nusmv.pluginSolution)" version="0" />
     <module reference="cac6875e-14fd-4552-a69e-b3168e27e2ff(com.mbeddr.formal.nusmv.tests)" version="0" />
     <module reference="6c88fcd1-5552-4d29-9f1b-f00bd84dd40e(com.mbeddr.mpsutil.genreview)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/editor.mps
index 01dc9ce69..9440d1bac 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/editor.mps
@@ -13,6 +13,7 @@
     <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
     <import index="p98h" ref="r:c81d99d9-842f-4ea8-b4f3-8f7f171b410f(com.mbeddr.formal.nusmv.pluginSolution.tests)" />
     <import index="mc3u" ref="r:c40f5d7d-8d11-4fe7-a7f1-b09919c94fc9(com.mbeddr.formal.base.tooling.simulator)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="fnq2" ref="r:412c918d-151c-45fe-acf3-0268d0d563c1(com.mbeddr.formal.nusmv.tests.structure)" implicit="true" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
@@ -427,7 +428,7 @@
               <node concept="3clFbF" id="14CuINs5Uvr" role="3cqZAp">
                 <node concept="2ShNRf" id="14CuINs5Uvp" role="3clFbG">
                   <node concept="1pGfFk" id="14CuINs5UTp" role="2ShVmc">
-                    <ref role="37wK5l" to="xnej:DubiFB4e4X" resolve="IconCell" />
+                    <ref role="37wK5l" to="1ks0:DubiFB4e4X" resolve="IconCell" />
                     <node concept="pncrf" id="14CuINs5UXj" role="37wK5m" />
                     <node concept="3cmrfG" id="14CuINs5Vdl" role="37wK5m">
                       <property role="3cmrfH" value="3" />
@@ -450,7 +451,7 @@
       <node concept="2iRkQZ" id="43FRfGJUEuX" role="2iSdaV" />
       <node concept="3F0ifn" id="43FRfGJUEvU" role="3EZMnx" />
       <node concept="PMmxH" id="4_pH3zvfwyh" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4_pH3zvd_oC" resolve="horizontalLine" />
+        <ref role="PMmxG" to="1ks0:4_pH3zvd_oC" resolve="horizontalLine" />
       </node>
       <node concept="3F0ifn" id="4_pH3zvfwxE" role="3EZMnx" />
       <node concept="3F2HdR" id="43FRfGJUEwK" role="3EZMnx">
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/com.mbeddr.formal.nusmv.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/com.mbeddr.formal.nusmv.mpl
index 9a4bd2c76..507a3bfa4 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/com.mbeddr.formal.nusmv.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/com.mbeddr.formal.nusmv.mpl
@@ -68,6 +68,7 @@
     <dependency reexport="false">692c2a6d-09c5-40f7-98f0-1f4b59860c1b(com.mbeddr.formal.nusmv.pluginSolution)</dependency>
     <dependency reexport="false">e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)</dependency>
     <dependency reexport="false">848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="2" />
@@ -130,6 +131,7 @@
     <module reference="001b2375-3bd5-4d5e-9958-6b3f62dc8548(com.mbeddr.formal.nusmv)" version="0" />
     <module reference="692c2a6d-09c5-40f7-98f0-1f4b59860c1b(com.mbeddr.formal.nusmv.pluginSolution)" version="0" />
     <module reference="6c88fcd1-5552-4d29-9f1b-f00bd84dd40e(com.mbeddr.mpsutil.genreview)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/editor.mps
index 56e9ae16a..16ac2d4af 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/editor.mps
@@ -22,6 +22,7 @@
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="3fe0" ref="r:848c2b01-cc1a-44aa-b277-5acd56d63ece(com.mbeddr.formal.base.expressions.editor)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
     <import index="ox2v" ref="r:9d0d3f45-3600-4f52-892b-d59f24c624ff(com.mbeddr.formal.base.expressions.behavior)" implicit="true" />
@@ -254,7 +255,7 @@
     <ref role="1XX52x" to="gioj:6NmtaR1SUJl" resolve="System" />
     <node concept="3EZMnI" id="6NmtaR1SUJu" role="2wV5jI">
       <node concept="PMmxH" id="4gtLUSMLm4A" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="2iRkQZ" id="6NmtaR1SUJx" role="2iSdaV" />
       <node concept="3F2HdR" id="6NmtaR1TTPF" role="3EZMnx">
@@ -1059,7 +1060,7 @@
     <node concept="3EZMnI" id="7mSH3WmWrI8" role="2wV5jI">
       <node concept="1kHk_G" id="7K_2cV$Golz" role="3EZMnx">
         <ref role="1NtTu8" to="gioj:7mSH3Wn8VYT" resolve="process" />
-        <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+        <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
       </node>
       <node concept="1iCGBv" id="7mSH3WmWrIi" role="3EZMnx">
         <ref role="1NtTu8" to="gioj:7mSH3WmWrHY" resolve="module" />
@@ -1178,7 +1179,7 @@
       </node>
       <node concept="3F0ifn" id="7mSH3WnduvE" role="3EZMnx">
         <property role="3F0ifm" value="FAIRNESS" />
-        <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+        <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
       </node>
       <node concept="3F1sOY" id="41M_24m3XDh" role="3EZMnx">
         <ref role="1NtTu8" to="gioj:7mSH3Wnduvy" resolve="condition" />
@@ -1239,7 +1240,7 @@
         </node>
         <node concept="3F0ifn" id="7mSH3WnuKA8" role="3EZMnx">
           <property role="3F0ifm" value="INIT" />
-          <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+          <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
         </node>
         <node concept="3F0ifn" id="7mSH3WnuKA9" role="3EZMnx">
           <property role="3F0ifm" value="{" />
@@ -1287,7 +1288,7 @@
         </node>
         <node concept="3F0ifn" id="7mSH3WnuKB5" role="3EZMnx">
           <property role="3F0ifm" value="INIT" />
-          <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+          <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
         </node>
         <node concept="3F0ifn" id="7mSH3WnuKBd" role="3EZMnx">
           <property role="3F0ifm" value="{" />
@@ -1411,7 +1412,7 @@
     <node concept="3EZMnI" id="7mSH3WnwK$$" role="2wV5jI">
       <node concept="3F0ifn" id="7mSH3WnwK$I" role="3EZMnx">
         <property role="3F0ifm" value="next" />
-        <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+        <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
       </node>
       <node concept="3F0ifn" id="7mSH3WnwK$R" role="3EZMnx">
         <property role="3F0ifm" value="(" />
@@ -1471,7 +1472,7 @@
         <node concept="l2Vlx" id="7mSH3WnE5jz" role="2iSdaV" />
         <node concept="3F0ifn" id="7mSH3WnE6g6" role="3EZMnx">
           <property role="3F0ifm" value="signed" />
-          <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+          <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
           <node concept="pkWqt" id="7mSH3WnE6ge" role="pqm2j">
             <node concept="3clFbS" id="7mSH3WnE6gf" role="2VODD2">
               <node concept="3clFbF" id="7mSH3WnE6ns" role="3cqZAp">
@@ -1507,7 +1508,7 @@
         </node>
         <node concept="3F0ifn" id="7mSH3WnE7zR" role="3EZMnx">
           <property role="3F0ifm" value="unsigned" />
-          <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+          <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
           <node concept="pkWqt" id="7mSH3WnE7H$" role="pqm2j">
             <node concept="3clFbS" id="7mSH3WnE7H_" role="2VODD2">
               <node concept="3clFbF" id="7mSH3WnE7ON" role="3cqZAp">
@@ -1547,7 +1548,7 @@
         </node>
         <node concept="3F0ifn" id="7mSH3WnE9nm" role="3EZMnx">
           <property role="3F0ifm" value="word" />
-          <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+          <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
         </node>
         <node concept="3F0ifn" id="7mSH3WnE9GO" role="3EZMnx">
           <property role="3F0ifm" value="[" />
@@ -1655,7 +1656,7 @@
       <node concept="3EZMnI" id="7$_eEdIcTeP" role="1LiK7o">
         <node concept="3F0ifn" id="70KFWMC587z" role="3EZMnx">
           <property role="3F0ifm" value="(" />
-          <ref role="1k5W1q" to="xnej:2CEi94dh36z" resolve="ParensStyle" />
+          <ref role="1k5W1q" to="1ks0:2CEi94dh36z" resolve="ParensStyle" />
           <node concept="11LMrY" id="70KFWMC7fAd" role="3F10Kt">
             <property role="VOm3f" value="true" />
           </node>
@@ -1683,14 +1684,14 @@
         </node>
         <node concept="3F0ifn" id="y826GHrpA5" role="3EZMnx">
           <property role="3F0ifm" value=")" />
-          <ref role="1k5W1q" to="xnej:2CEi94dh36z" resolve="ParensStyle" />
+          <ref role="1k5W1q" to="1ks0:2CEi94dh36z" resolve="ParensStyle" />
           <node concept="11L4FC" id="y826GHrq9R" role="3F10Kt">
             <property role="VOm3f" value="true" />
           </node>
         </node>
         <node concept="3F0ifn" id="y826GHrpAJ" role="3EZMnx">
           <property role="3F0ifm" value="?" />
-          <ref role="1k5W1q" to="xnej:y826GHffn9" resolve="OpStyle" />
+          <ref role="1k5W1q" to="1ks0:y826GHffn9" resolve="OpStyle" />
           <node concept="11L4FC" id="y826GHrpD$" role="3F10Kt">
             <property role="VOm3f" value="true" />
           </node>
@@ -1703,7 +1704,7 @@
         </node>
         <node concept="3F0ifn" id="7$_eEdIcTeU" role="3EZMnx">
           <property role="3F0ifm" value="(" />
-          <ref role="1k5W1q" to="xnej:2CEi94dh36z" resolve="ParensStyle" />
+          <ref role="1k5W1q" to="1ks0:2CEi94dh36z" resolve="ParensStyle" />
           <node concept="3mYdg7" id="y826GHrpLE" role="3F10Kt">
             <property role="1413C4" value="par2" />
           </node>
@@ -1717,7 +1718,7 @@
         <node concept="l2Vlx" id="7$_eEdIcTeR" role="2iSdaV" />
         <node concept="3F0ifn" id="7$_eEdIcTeY" role="3EZMnx">
           <property role="3F0ifm" value=")" />
-          <ref role="1k5W1q" to="xnej:2CEi94dh36z" resolve="ParensStyle" />
+          <ref role="1k5W1q" to="1ks0:2CEi94dh36z" resolve="ParensStyle" />
           <node concept="3mYdg7" id="y826GHrpOR" role="3F10Kt">
             <property role="1413C4" value="par2" />
           </node>
@@ -1727,7 +1728,7 @@
         </node>
         <node concept="3F0ifn" id="y826GHrpLJ" role="3EZMnx">
           <property role="3F0ifm" value=":" />
-          <ref role="1k5W1q" to="xnej:y826GHffn9" resolve="OpStyle" />
+          <ref role="1k5W1q" to="1ks0:y826GHffn9" resolve="OpStyle" />
           <node concept="11L4FC" id="y826GHrpLK" role="3F10Kt">
             <property role="VOm3f" value="true" />
           </node>
@@ -1740,7 +1741,7 @@
         </node>
         <node concept="3F0ifn" id="y826GHrpOW" role="3EZMnx">
           <property role="3F0ifm" value="(" />
-          <ref role="1k5W1q" to="xnej:2CEi94dh36z" resolve="ParensStyle" />
+          <ref role="1k5W1q" to="1ks0:2CEi94dh36z" resolve="ParensStyle" />
           <node concept="11LMrY" id="y826GHrpOY" role="3F10Kt">
             <property role="VOm3f" value="true" />
           </node>
@@ -1753,7 +1754,7 @@
         </node>
         <node concept="3F0ifn" id="70KFWMC587N" role="3EZMnx">
           <property role="3F0ifm" value=")" />
-          <ref role="1k5W1q" to="xnej:2CEi94dh36z" resolve="ParensStyle" />
+          <ref role="1k5W1q" to="1ks0:2CEi94dh36z" resolve="ParensStyle" />
           <node concept="11L4FC" id="70KFWMC7fI2" role="3F10Kt">
             <property role="VOm3f" value="true" />
           </node>
@@ -2331,7 +2332,7 @@
       </node>
       <node concept="3F0ifn" id="41M_24m3YTF" role="3EZMnx">
         <property role="3F0ifm" value="JUSTICE" />
-        <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+        <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
       </node>
       <node concept="3F1sOY" id="41M_24m3YTG" role="3EZMnx">
         <ref role="1NtTu8" to="gioj:41M_24m3YT_" resolve="condition" />
@@ -2354,7 +2355,7 @@
       </node>
       <node concept="3F0ifn" id="41M_24m3Zfc" role="3EZMnx">
         <property role="3F0ifm" value="COMPASSION" />
-        <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+        <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
       </node>
       <node concept="3F0ifn" id="41M_24m3ZfJ" role="3EZMnx">
         <property role="3F0ifm" value="(" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/com.mbeddr.formal.ocra.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/com.mbeddr.formal.ocra.mpl
index 3b9102d2d..8d8e677a9 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/com.mbeddr.formal.ocra.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/com.mbeddr.formal.ocra.mpl
@@ -18,6 +18,7 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">001b2375-3bd5-4d5e-9958-6b3f62dc8548(com.mbeddr.formal.nusmv)</dependency>
     <dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="2" />
@@ -69,6 +70,7 @@
     <module reference="001b2375-3bd5-4d5e-9958-6b3f62dc8548(com.mbeddr.formal.nusmv)" version="0" />
     <module reference="c0e6afd4-e20f-4e33-9970-004cf26b9bf6(com.mbeddr.formal.nusmv.ext)" version="0" />
     <module reference="5ccce04a-9411-450d-8af4-a858c6f99d1e(com.mbeddr.formal.ocra)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/models/com.mbeddr.formal.ocra.editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/models/com.mbeddr.formal.ocra.editor.mps
index e1f81b141..263dd826f 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/models/com.mbeddr.formal.ocra.editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/models/com.mbeddr.formal.ocra.editor.mps
@@ -8,9 +8,10 @@
   </languages>
   <imports>
     <import index="hqls" ref="r:9be6a7f5-8948-4321-86ee-36906d4a48b4(com.mbeddr.formal.ocra.structure)" />
-    <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" implicit="true" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
+    <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" implicit="true" />
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
@@ -223,7 +224,7 @@
     <ref role="1XX52x" to="hqls:1WjQLbKt0sx" resolve="OthelloSystemSpecification" />
     <node concept="3EZMnI" id="5iGdg8L_FKA" role="2wV5jI">
       <node concept="PMmxH" id="4JMCPGgvPM_" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3F0ifn" id="1QMZQ03SJsk" role="3EZMnx">
         <node concept="pVoyu" id="1QMZQ03SJsD" role="3F10Kt">
@@ -1312,7 +1313,7 @@
     <node concept="3EZMnI" id="7mSH3WnwK$$" role="2wV5jI">
       <node concept="3F0ifn" id="7mSH3WnwK$I" role="3EZMnx">
         <property role="3F0ifm" value="der" />
-        <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+        <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
       </node>
       <node concept="3F0ifn" id="7mSH3WnwK$R" role="3EZMnx">
         <property role="3F0ifm" value="(" />
@@ -1341,7 +1342,7 @@
     <node concept="3EZMnI" id="404$BAz1QzH" role="2wV5jI">
       <node concept="3F0ifn" id="404$BAz1QzI" role="3EZMnx">
         <property role="3F0ifm" value="change" />
-        <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+        <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
       </node>
       <node concept="3F0ifn" id="404$BAz1QzJ" role="3EZMnx">
         <property role="3F0ifm" value="(" />
@@ -1455,7 +1456,7 @@
     <ref role="1XX52x" to="hqls:2OfmkSXY_kt" resolve="OthelloLibrarySpecification" />
     <node concept="3EZMnI" id="2OfmkSXY_uT" role="2wV5jI">
       <node concept="PMmxH" id="2OfmkSXY_uU" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3F0ifn" id="2OfmkSXY_uV" role="3EZMnx">
         <node concept="pVoyu" id="2OfmkSXY_uW" role="3F10Kt">
diff --git a/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/com.mbeddr.formal.prism.mpl b/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/com.mbeddr.formal.prism.mpl
index 8f9a3d99d..ec775206b 100644
--- a/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/com.mbeddr.formal.prism.mpl
+++ b/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/com.mbeddr.formal.prism.mpl
@@ -17,6 +17,7 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">3c34ac43-22de-4ba4-9539-377c90eb9be6(com.mbeddr.formal.prism)</dependency>
     <dependency reexport="false">b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="2" />
@@ -66,6 +67,7 @@
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)" version="0" />
     <module reference="3c34ac43-22de-4ba4-9539-377c90eb9be6(com.mbeddr.formal.prism)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/models/com.mbeddr.formal.prism.editor.mps b/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/models/com.mbeddr.formal.prism.editor.mps
index 7ddceb593..4825bb597 100644
--- a/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/models/com.mbeddr.formal.prism.editor.mps
+++ b/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/models/com.mbeddr.formal.prism.editor.mps
@@ -8,6 +8,7 @@
   </languages>
   <imports>
     <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="c1ru" ref="r:906fd65e-f25a-46a4-93f3-5b3ffd79b93f(com.mbeddr.formal.prism.structure)" implicit="true" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
@@ -130,7 +131,7 @@
     <ref role="1XX52x" to="c1ru:ZaBFheJI2L" resolve="PrismModel" />
     <node concept="3EZMnI" id="6NmtaR1SUJu" role="2wV5jI">
       <node concept="PMmxH" id="4gtLUSMLm4A" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="2iRkQZ" id="6NmtaR1SUJx" role="2iSdaV" />
       <node concept="3F2HdR" id="6NmtaR1TTPF" role="3EZMnx">
@@ -474,7 +475,7 @@
     <ref role="1XX52x" to="c1ru:1xpXAu0OFTn" resolve="PrismSpecification" />
     <node concept="3EZMnI" id="1xpXAu0OFWx" role="2wV5jI">
       <node concept="PMmxH" id="1xpXAu0OFWy" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3EZMnI" id="1xpXAu0URNi" role="3EZMnx">
         <node concept="VPM3Z" id="1xpXAu0URNk" role="3F10Kt" />
diff --git a/code/languages/com.mbeddr.formal.prism/solutions/com.mbeddr.formal.prism.pluginSolution/com.mbeddr.formal.prism.pluginSolution.msd b/code/languages/com.mbeddr.formal.prism/solutions/com.mbeddr.formal.prism.pluginSolution/com.mbeddr.formal.prism.pluginSolution.msd
index bdaf21271..4f19a477b 100644
--- a/code/languages/com.mbeddr.formal.prism/solutions/com.mbeddr.formal.prism.pluginSolution/com.mbeddr.formal.prism.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.prism/solutions/com.mbeddr.formal.prism.pluginSolution/com.mbeddr.formal.prism.pluginSolution.msd
@@ -25,6 +25,7 @@
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/com.fasten.req.odd.mpl b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/com.fasten.req.odd.mpl
index d7504a4ab..19be94459 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/com.fasten.req.odd.mpl
+++ b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/com.fasten.req.odd.mpl
@@ -16,6 +16,7 @@
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
     <dependency reexport="false">b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)</dependency>
     <dependency reexport="false">65ed2ac6-4499-4751-951e-3819684a4b8d(com.fasten.req.ontology)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:120e1c9d-4e27-4478-b2af-b2c3bd3850b0:com.mbeddr.mpsutil.editor.querylist" version="0" />
@@ -71,6 +72,7 @@
     <module reference="65ed2ac6-4499-4751-951e-3819684a4b8d(com.fasten.req.ontology)" version="0" />
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.editor.mps b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.editor.mps
index 8c714e4c6..038026868 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.editor.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.editor.mps
@@ -10,6 +10,7 @@
   </languages>
   <imports>
     <import index="u2ih" ref="r:ab00bc1f-8fc9-4bdf-9a87-1e2713aafade(com.fasten.req.odd.structure)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" implicit="true" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
@@ -208,7 +209,7 @@
     <ref role="1XX52x" to="u2ih:3Jn$RV31nMq" resolve="ODD" />
     <node concept="3EZMnI" id="3Jn$RV31nVT" role="2wV5jI">
       <node concept="PMmxH" id="3Jn$RV31nW0" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3F0ifn" id="3Jn$RV31nW2" role="3EZMnx" />
       <node concept="3F2HdR" id="3Jn$RV31nW9" role="3EZMnx">
@@ -333,7 +334,7 @@
     <ref role="1XX52x" to="u2ih:3Jn$RV31w1l" resolve="Ontology_old" />
     <node concept="3EZMnI" id="3Jn$RV31w2y" role="2wV5jI">
       <node concept="PMmxH" id="3Jn$RV31w2D" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3F0ifn" id="52bCGvYEnPy" role="3EZMnx" />
       <node concept="3EZMnI" id="52bCGvYEnPO" role="3EZMnx">
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/com.fasten.req.ontology.mpl b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/com.fasten.req.ontology.mpl
index 7d1943600..810c934f5 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/com.fasten.req.ontology.mpl
+++ b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/com.fasten.req.ontology.mpl
@@ -20,6 +20,7 @@
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">7b45fa94-2707-4a1a-9e6a-ce40c4aaf35a(de.itemis.mps.editor.collapsible.runtime)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:120e1c9d-4e27-4478-b2af-b2c3bd3850b0:com.mbeddr.mpsutil.editor.querylist" version="0" />
@@ -74,6 +75,7 @@
     <module reference="65ed2ac6-4499-4751-951e-3819684a4b8d(com.fasten.req.ontology)" version="0" />
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="bda054c4-5d71-46ca-aba0-7104e3070b5a(com.mbeddr.mpsutil.treenotation.styles)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="7b45fa94-2707-4a1a-9e6a-ce40c4aaf35a(de.itemis.mps.editor.collapsible.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.editor.mps b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.editor.mps
index 29eb8a2a1..bd6cb615d 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.editor.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.editor.mps
@@ -26,6 +26,7 @@
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="f4zo" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.cells(MPS.Editor/)" />
     <import index="s6s" ref="r:d5c12ac5-8ab6-4a1e-b231-be1ce0ac2773(de.itemis.mps.editor.collapsible.runtime)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
   </imports>
   <registry>
@@ -437,7 +438,7 @@
     <ref role="1XX52x" to="6wa3:3Jn$RV31w1l" resolve="Ontology" />
     <node concept="3EZMnI" id="3Jn$RV31w2y" role="2wV5jI">
       <node concept="PMmxH" id="3Jn$RV31w2D" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3F0ifn" id="52bCGvYEnPy" role="3EZMnx" />
       <node concept="3EZMnI" id="52bCGvYEnPO" role="3EZMnx">
@@ -477,7 +478,7 @@
     </node>
     <node concept="3EZMnI" id="1wKSXwEAKjg" role="2wV5jI">
       <node concept="PMmxH" id="1wKSXwEAKjh" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="1HlG4h" id="1f_hJh21tsw" role="3EZMnx">
         <node concept="1HfYo3" id="1f_hJh21tsy" role="1HlULh">
@@ -732,7 +733,7 @@
               </node>
             </node>
             <node concept="1HlG4h" id="4vIVwd75633" role="3v1y6z">
-              <ref role="1k5W1q" to="xnej:2CEi94e3iKI" resolve="PassiveTextStyle" />
+              <ref role="1k5W1q" to="1ks0:2CEi94e3iKI" resolve="PassiveTextStyle" />
               <node concept="VSNWy" id="4vIVwd75iqj" role="3F10Kt">
                 <property role="1lJzqX" value="8" />
               </node>
@@ -996,7 +997,7 @@
                 </node>
               </node>
               <node concept="1HlG4h" id="4vIVwd755tk" role="3v1y6z">
-                <ref role="1k5W1q" to="xnej:2CEi94e3iKI" resolve="PassiveTextStyle" />
+                <ref role="1k5W1q" to="1ks0:2CEi94e3iKI" resolve="PassiveTextStyle" />
                 <node concept="VSNWy" id="4vIVwd75ihK" role="3F10Kt">
                   <property role="1lJzqX" value="8" />
                 </node>
@@ -1879,7 +1880,7 @@
     </node>
     <node concept="3EZMnI" id="kZSvS5QryZ" role="2wV5jI">
       <node concept="PMmxH" id="kZSvS5Qrz0" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="1HlG4h" id="kZSvS5Qrz1" role="3EZMnx">
         <node concept="1HfYo3" id="kZSvS5Qrz2" role="1HlULh">
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/com.mbeddr.formal.req.base.mpl b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/com.mbeddr.formal.req.base.mpl
index 6ce440e62..a19fbe279 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/com.mbeddr.formal.req.base.mpl
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/com.mbeddr.formal.req.base.mpl
@@ -69,6 +69,7 @@
     <dependency reexport="false">d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:120e1c9d-4e27-4478-b2af-b2c3bd3850b0:com.mbeddr.mpsutil.editor.querylist" version="0" />
@@ -117,6 +118,7 @@
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="0deccdfd-196b-4d8c-895e-0d6cb8014dfd(com.mbeddr.formal.req.base)" version="0" />
     <module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="1919c723-b60b-4592-9318-9ce96d91da44(de.itemis.mps.editor.celllayout)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/editor.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/editor.mps
index 760bd1c9c..7095d8783 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/editor.mps
@@ -31,6 +31,7 @@
     <import index="z27p" ref="r:9796df7f-5d01-4a46-b1e4-58be8e3ac472(com.mbeddr.formal.req.base.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="tbr6" ref="r:6a005c26-87c0-43c4-8cf3-49ffba1099df(de.slisson.mps.richtext.behavior)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" implicit="true" />
     <import index="48kf" ref="r:5f41c82d-84d1-4fb1-a1cf-6697d2365854(com.mbeddr.mpsutil.filepicker.behavior)" implicit="true" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
@@ -477,7 +478,7 @@
     <ref role="1XX52x" to="z27p:4gtLUSMLiMx" resolve="RequirementDocument" />
     <node concept="3EZMnI" id="4gtLUSMLiTb" role="2wV5jI">
       <node concept="PMmxH" id="4qtpAOhXdCO" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3F2HdR" id="4qtpAOhXdPR" role="3EZMnx">
         <ref role="1NtTu8" to="z27p:4gtLUSMLiT5" resolve="requirements" />
@@ -624,7 +625,7 @@
         </node>
       </node>
       <node concept="PMmxH" id="2N7iSwG$ExF" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4_pH3zvd_oC" resolve="horizontalLine" />
+        <ref role="PMmxG" to="1ks0:4_pH3zvd_oC" resolve="horizontalLine" />
         <node concept="27z8qx" id="SmAS9iizqf" role="3F10Kt">
           <property role="3$6WeP" value="-3" />
         </node>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/com.mbeddr.formal.req.scenarios.mpl b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/com.mbeddr.formal.req.scenarios.mpl
index adbc8bc9d..fba11cdfa 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/com.mbeddr.formal.req.scenarios.mpl
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/com.mbeddr.formal.req.scenarios.mpl
@@ -71,6 +71,7 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">0deccdfd-196b-4d8c-895e-0d6cb8014dfd(com.mbeddr.formal.req.base)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:7e450f4e-1ac3-41ef-a851-4598161bdb94:de.slisson.mps.tables" version="0" />
@@ -118,6 +119,7 @@
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="0deccdfd-196b-4d8c-895e-0d6cb8014dfd(com.mbeddr.formal.req.base)" version="0" />
     <module reference="3460ac43-6f59-4f61-b134-9fa2f799c2d3(com.mbeddr.formal.req.scenarios)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/models/com.mbeddr.formal.req.scenarios.editor.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/models/com.mbeddr.formal.req.scenarios.editor.mps
index 9f8434dcd..d40eefec4 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/models/com.mbeddr.formal.req.scenarios.editor.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/models/com.mbeddr.formal.req.scenarios.editor.mps
@@ -10,6 +10,7 @@
     <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
     <import index="exr9" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor(MPS.Editor/)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="uiqf" ref="r:284d7186-e902-4338-a3e0-8017019deafe(com.mbeddr.formal.req.scenarios.structure)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
@@ -188,7 +189,7 @@
     <ref role="1XX52x" to="uiqf:41_NtXJpOPl" resolve="ActorsCatalogue" />
     <node concept="3EZMnI" id="4gtLUSMLiTb" role="2wV5jI">
       <node concept="PMmxH" id="4qtpAOhXdCO" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3F0ifn" id="4qtpAOhXdOP" role="3EZMnx" />
       <node concept="2rfBfz" id="41_NtXJpPtU" role="3EZMnx">
@@ -238,7 +239,7 @@
     <ref role="1XX52x" to="uiqf:41_NtXJpOPh" resolve="ScenariosCatalogue" />
     <node concept="3EZMnI" id="41_NtXJpPvc" role="2wV5jI">
       <node concept="PMmxH" id="41_NtXJpPvd" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3F0ifn" id="41_NtXJpPve" role="3EZMnx" />
       <node concept="3F2HdR" id="41_NtXJpPvu" role="3EZMnx">
@@ -302,7 +303,7 @@
     <ref role="1XX52x" to="uiqf:41_NtXJpUVJ" resolve="ContextCatalogue" />
     <node concept="3EZMnI" id="41_NtXJpUZD" role="2wV5jI">
       <node concept="PMmxH" id="41_NtXJpUZE" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3F0ifn" id="41_NtXJpUZF" role="3EZMnx" />
       <node concept="2rfBfz" id="41_NtXJqg3N" role="3EZMnx">
@@ -401,7 +402,7 @@
         <node concept="l2Vlx" id="2N7iSwG$_7J" role="2iSdaV" />
       </node>
       <node concept="PMmxH" id="2N7iSwG$ExF" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4_pH3zvd_oC" resolve="horizontalLine" />
+        <ref role="PMmxG" to="1ks0:4_pH3zvd_oC" resolve="horizontalLine" />
       </node>
       <node concept="3F0ifn" id="2N7iSwG_2oI" role="3EZMnx">
         <property role="3F0ifm" value="⏎" />
diff --git a/code/languages/com.mbeddr.formal.safety/.mps/libraries.xml b/code/languages/com.mbeddr.formal.safety/.mps/libraries.xml
index feb4b0a83..ff4485823 100644
--- a/code/languages/com.mbeddr.formal.safety/.mps/libraries.xml
+++ b/code/languages/com.mbeddr.formal.safety/.mps/libraries.xml
@@ -51,6 +51,14 @@
             </Library>
           </value>
         </entry>
+        <entry key="symo">
+          <value>
+            <Library>
+              <option name="name" value="symo" />
+              <option name="path" value="${mbeddr.formal.home}/code/languages/com.fasten.symo" />
+            </Library>
+          </value>
+        </entry>
       </map>
     </option>
   </component>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/com.fasten.process.review.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/com.fasten.process.review.mpl
index be42de2e3..17dee99fd 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/com.fasten.process.review.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/com.fasten.process.review.mpl
@@ -14,6 +14,7 @@
   <dependencies>
     <dependency reexport="false">92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f89904fb-9486-43a1-865e-5ad0375a8a88:de.itemis.mps.editor.bool" version="0" />
@@ -66,6 +67,7 @@
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="6d475058-7ea2-490d-87e7-0f7f46dccc66(com.fasten.process.review)" version="0" />
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.editor.mps
index 382e0fc6d..4bfa6e0ec 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.editor.mps
@@ -13,6 +13,7 @@
     <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
     <import index="hyam" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.event(JDK/)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="kivz" ref="r:dd766917-4a5c-40cc-9eef-1d695686872d(com.fasten.process.review.structure)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
@@ -244,7 +245,7 @@
     <ref role="1XX52x" to="kivz:5t37uj6__pB" resolve="ReviewsContainer" />
     <node concept="3EZMnI" id="5t37uj6_F69" role="2wV5jI">
       <node concept="PMmxH" id="5t37uj6_F6j" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3EZMnI" id="5t37uj6_F6s" role="3EZMnx">
         <node concept="2iRfu4" id="5t37uj6_F6t" role="2iSdaV" />
@@ -490,7 +491,7 @@
         <node concept="l2Vlx" id="5t37uj6D0WA" role="2iSdaV" />
       </node>
       <node concept="PMmxH" id="5t37uj6D0Wm" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4_pH3zvd_oC" resolve="horizontalLine" />
+        <ref role="PMmxG" to="1ks0:4_pH3zvd_oC" resolve="horizontalLine" />
       </node>
       <node concept="3F0ifn" id="5t37uj6CZI$" role="3EZMnx" />
       <node concept="2iRkQZ" id="5t37uj6CZHC" role="2iSdaV" />
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 93fed6e88..fd2f668c1 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
@@ -15,6 +15,7 @@
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="1" />
@@ -62,6 +63,7 @@
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="14289527-ae82-48f0-ab60-380cec6ac506(com.fasten.safety.bayesian_network)" version="0" />
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
   </dependencyVersions>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/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 a8a3cdd7a..967c5cd7f 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
@@ -14,6 +14,7 @@
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="zqec" ref="r:4b509217-3274-43e6-be70-84e45864fd71(com.fasten.safety.bayesian_network.structure)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" implicit="true" />
@@ -437,7 +438,7 @@
     <ref role="1XX52x" to="zqec:3sgpJkb4cfD" resolve="BayesianNetwork" />
     <node concept="3EZMnI" id="3GRi4m$qQ5q" role="2wV5jI">
       <node concept="PMmxH" id="2LDKh2uDSuv" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3F0ifn" id="3GRi4m$qQa$" role="3EZMnx" />
       <node concept="3F2HdR" id="3sgpJkb5gUh" role="3EZMnx">
@@ -464,7 +465,7 @@
       </node>
       <node concept="3F0ifn" id="3sgpJkb4Xpe" role="3EZMnx">
         <property role="3F0ifm" value=";" />
-        <ref role="1k5W1q" to="xnej:hFDgi_W" resolve="Semicolon" />
+        <ref role="1k5W1q" to="1ks0:hFDgi_W" resolve="Semicolon" />
       </node>
     </node>
     <node concept="2aJ2om" id="3sgpJkb5jGm" role="CpUAK">
@@ -511,7 +512,7 @@
     <ref role="1XX52x" to="zqec:3sgpJkb4cfD" resolve="BayesianNetwork" />
     <node concept="3EZMnI" id="3sgpJkb5jFX" role="2wV5jI">
       <node concept="PMmxH" id="3sgpJkb5jFY" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3F0ifn" id="3sgpJkb5jFZ" role="3EZMnx" />
       <node concept="27vDVx" id="3sgpJkb5jG8" role="3EZMnx">
@@ -602,7 +603,7 @@
           <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
         </node>
         <node concept="PMmxH" id="3sgpJkb5jHR" role="3EZMnx">
-          <ref role="PMmxG" to="xnej:4_pH3zvd_oC" resolve="horizontalLine" />
+          <ref role="PMmxG" to="1ks0:4_pH3zvd_oC" resolve="horizontalLine" />
         </node>
         <node concept="3F0ifn" id="3sgpJkbiSAy" role="3EZMnx">
           <node concept="pkWqt" id="3sgpJkbmy8$" role="pqm2j">
@@ -694,7 +695,7 @@
       </node>
       <node concept="3F0ifn" id="3sgpJkb5jIi" role="3EZMnx">
         <property role="3F0ifm" value=";" />
-        <ref role="1k5W1q" to="xnej:hFDgi_W" resolve="Semicolon" />
+        <ref role="1k5W1q" to="1ks0:hFDgi_W" resolve="Semicolon" />
       </node>
       <node concept="2iRfu4" id="3sgpJkb5jIj" role="2iSdaV" />
     </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/com.fasten.safety.fmea.iso26262.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/com.fasten.safety.fmea.iso26262.mpl
index 3b45b67cf..4b0e92cf7 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/com.fasten.safety.fmea.iso26262.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/com.fasten.safety.fmea.iso26262.mpl
@@ -15,6 +15,7 @@
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f89904fb-9486-43a1-865e-5ad0375a8a88:de.itemis.mps.editor.bool" version="0" />
@@ -64,6 +65,7 @@
     <module reference="dc773f77-cced-42c8-ba62-465140b810a5(com.fasten.safety.fmea.iso26262)" version="0" />
     <module reference="fff52720-b1df-4cd2-a8f7-d487bca333ba(com.fasten.safety.fmeda)" version="0" />
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/models/com.fasten.safety.fmea.iso26262.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/models/com.fasten.safety.fmea.iso26262.editor.mps
index c36f83bae..2313f41c9 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/models/com.fasten.safety.fmea.iso26262.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/models/com.fasten.safety.fmea.iso26262.editor.mps
@@ -13,6 +13,7 @@
     <import index="vicv" ref="r:b37643be-188d-4d39-96f8-132e87814a06(com.fasten.safety.fmea.iso26262.structure)" />
     <import index="b64w" ref="r:6afcb499-f0e8-4360-a726-91f0159f2fd9(com.fasten.safety.fmea.iso26262.behavior)" />
     <import index="6k2r" ref="r:caa5c61b-1fdb-4b2d-a184-3bec7eaec4f9(com.fasten.safety.fmea.structure)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
@@ -191,13 +192,13 @@
             <node concept="3F0A7n" id="2TaO3kYBHMR" role="2wV5jI">
               <property role="1Intyy" value="true" />
               <ref role="1NtTu8" to="vicv:2TaO3kYv$an" resolve="fit" />
-              <ref role="1k5W1q" to="xnej:2CEi94e3iKI" resolve="PassiveTextStyle" />
+              <ref role="1k5W1q" to="1ks0:2CEi94e3iKI" resolve="PassiveTextStyle" />
             </node>
           </node>
         </node>
         <node concept="3F0ifn" id="2TaO3kY$Ux1" role="3EZMnx">
           <property role="3F0ifm" value="FIT" />
-          <ref role="1k5W1q" to="xnej:2CEi94e3iKI" resolve="PassiveTextStyle" />
+          <ref role="1k5W1q" to="1ks0:2CEi94e3iKI" resolve="PassiveTextStyle" />
         </node>
         <node concept="3F0ifn" id="42QGQFVnOlW" role="3EZMnx">
           <property role="3F0ifm" value="{" />
@@ -223,7 +224,7 @@
     <ref role="1XX52x" to="vicv:2TaO3kYvzOZ" resolve="ElectronicComponentTypeCatalogue" />
     <node concept="3EZMnI" id="5rwT_Jny5eS" role="2wV5jI">
       <node concept="PMmxH" id="2LDKh2uDSuv" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3F0ifn" id="2TaO3kYv$ag" role="3EZMnx" />
       <node concept="2rfBfz" id="2TaO3kYv$ai" role="3EZMnx">
@@ -263,7 +264,7 @@
     <ref role="1XX52x" to="vicv:2TaO3kYv4an" resolve="ElectronicComponentCatalogue" />
     <node concept="3EZMnI" id="2TaO3kYvDN7" role="2wV5jI">
       <node concept="PMmxH" id="2TaO3kYvDN8" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3F0ifn" id="2TaO3kYvDN9" role="3EZMnx" />
       <node concept="2rfBfz" id="2TaO3kYvDNa" role="3EZMnx">
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/com.fasten.safety.fmea.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/com.fasten.safety.fmea.mpl
index f13c6cefc..4a53f517f 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/com.fasten.safety.fmea.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/com.fasten.safety.fmea.mpl
@@ -14,6 +14,7 @@
   <dependencies>
     <dependency reexport="false">92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:7e450f4e-1ac3-41ef-a851-4598161bdb94:de.slisson.mps.tables" version="0" />
@@ -60,6 +61,7 @@
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="b43c548b-f75f-46e2-ad24-de9edd93e95e(com.fasten.safety.fmea)" version="0" />
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.editor.mps
index 2ccfc3ee9..0e0f546e8 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.editor.mps
@@ -11,6 +11,7 @@
   <imports>
     <import index="6k2r" ref="r:caa5c61b-1fdb-4b2d-a184-3bec7eaec4f9(com.fasten.safety.fmea.structure)" />
     <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="arip" ref="r:05796a31-2f42-44d2-9b5e-7769941d865b(com.fasten.safety.fmea.behavior)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
@@ -260,7 +261,7 @@
     <ref role="1XX52x" to="6k2r:7j1NWs14dHd" resolve="DesignFMEARoot" />
     <node concept="3EZMnI" id="5rwT_Jny5eS" role="2wV5jI">
       <node concept="PMmxH" id="2LDKh2uDSuv" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3F2HdR" id="7j1NWs14i3x" role="3EZMnx">
         <ref role="1NtTu8" to="6k2r:7j1NWs14dIk" resolve="dfmeas" />
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 9a0323da1..abeacdb54 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
@@ -24,6 +24,7 @@
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">6b84fb9e-5f09-4a61-bf31-3bfdc54820e3(com.mpsbasics.editor.utils)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:120e1c9d-4e27-4478-b2af-b2c3bd3850b0:com.mbeddr.mpsutil.editor.querylist" version="0" />
@@ -84,6 +85,7 @@
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)" version="0" />
     <module reference="bda054c4-5d71-46ca-aba0-7104e3070b5a(com.mbeddr.mpsutil.treenotation.styles)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="6b84fb9e-5f09-4a61-bf31-3bfdc54820e3(com.mpsbasics.editor.utils)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
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 3a7284814..46ab1d9c8 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
@@ -23,6 +23,7 @@
     <import index="e57x" ref="r:99808a14-1913-4248-aed8-3139a5d05f88(com.mbeddr.formal.base.styles)" />
     <import index="suqv" ref="r:9a28b49a-e98c-4186-a7e1-7e782b3f4fc3(de.itemis.mps.editor.diagram.layout.structure)" />
     <import index="5un2" ref="r:00d6ee44-268c-4818-b3e7-4eecf669c7ee(com.mbeddr.mpsutil.treenotation.styles.editor)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="tbr6" ref="r:6a005c26-87c0-43c4-8cf3-49ffba1099df(de.slisson.mps.richtext.behavior)" implicit="true" />
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" implicit="true" />
     <import index="fazf" ref="r:28cb0bbd-efcb-4c9e-94f2-4ccc928adfb4(com.fasten.safety.ft.behavior)" implicit="true" />
@@ -637,7 +638,7 @@
     <ref role="1XX52x" to="spwl:5rwT_JnuQVv" resolve="FaultTree" />
     <node concept="3EZMnI" id="5rwT_Jny5eS" role="2wV5jI">
       <node concept="PMmxH" id="2LDKh2uDSuv" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
         <node concept="pkWqt" id="WKGDODOnGl" role="pqm2j">
           <node concept="3clFbS" id="WKGDODOnGm" role="2VODD2">
             <node concept="3clFbF" id="WKGDODOoa6" role="3cqZAp">
@@ -3086,7 +3087,7 @@
     </node>
     <node concept="3EZMnI" id="7wRJ5ynOsrV" role="2wV5jI">
       <node concept="PMmxH" id="7wRJ5ynOsyb" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
         <node concept="pkWqt" id="7wRJ5ynOsyc" role="pqm2j">
           <node concept="3clFbS" id="7wRJ5ynOsyd" role="2VODD2">
             <node concept="3clFbF" id="7wRJ5ynOsye" role="3cqZAp">
@@ -3554,7 +3555,7 @@
     <ref role="1XX52x" to="spwl:5rwT_JnuQVv" resolve="FaultTree" />
     <node concept="3EZMnI" id="7wRJ5ynOywq" role="2wV5jI">
       <node concept="PMmxH" id="7wRJ5ynOywx" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
         <node concept="pkWqt" id="7wRJ5ynOywy" role="pqm2j">
           <node concept="3clFbS" id="7wRJ5ynOywz" role="2VODD2">
             <node concept="3clFbF" id="7wRJ5ynOyw$" role="3cqZAp">
@@ -3609,7 +3610,7 @@
       </node>
       <node concept="3F0ifn" id="7wRJ5ynOLG0" role="3EZMnx">
         <property role="3F0ifm" value=";" />
-        <ref role="1k5W1q" to="xnej:hFDgi_W" resolve="Semicolon" />
+        <ref role="1k5W1q" to="1ks0:hFDgi_W" resolve="Semicolon" />
       </node>
       <node concept="l2Vlx" id="7wRJ5ynOLFD" role="2iSdaV" />
     </node>
@@ -3651,7 +3652,7 @@
       <node concept="l2Vlx" id="7wRJ5ynOLGh" role="2iSdaV" />
       <node concept="3F0ifn" id="36k0PnKJGGD" role="3EZMnx">
         <property role="3F0ifm" value=";" />
-        <ref role="1k5W1q" to="xnej:hFDgi_W" resolve="Semicolon" />
+        <ref role="1k5W1q" to="1ks0:hFDgi_W" resolve="Semicolon" />
       </node>
     </node>
     <node concept="2aJ2om" id="7wRJ5ynOLGb" role="CpUAK">
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/com.fasten.safety.hazop.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/com.fasten.safety.hazop.mpl
index c3e929f90..39b3bb430 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/com.fasten.safety.hazop.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/com.fasten.safety.hazop.mpl
@@ -14,6 +14,7 @@
   <dependencies>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:7e450f4e-1ac3-41ef-a851-4598161bdb94:de.slisson.mps.tables" version="0" />
@@ -60,6 +61,7 @@
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="7af989c3-8042-42ae-bf04-8bcfa8f9dbf9(com.fasten.safety.hazop)" version="0" />
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/models/com.fasten.safety.hazop.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/models/com.fasten.safety.hazop.editor.mps
index 086316382..dff948300 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/models/com.fasten.safety.hazop.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/models/com.fasten.safety.hazop.editor.mps
@@ -9,6 +9,7 @@
   </languages>
   <imports>
     <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="2w7f" ref="r:ea300b49-36a6-4fa8-9ccd-411a1c328f70(com.fasten.safety.hazop.structure)" implicit="true" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
   </imports>
@@ -61,7 +62,7 @@
     <ref role="1XX52x" to="2w7f:4UQF4xbCO5S" resolve="HAZOPAnalysisBase" />
     <node concept="3EZMnI" id="5rwT_Jny5eS" role="2wV5jI">
       <node concept="PMmxH" id="2LDKh2uDSuv" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3F0ifn" id="4UQF4xbCOaF" role="3EZMnx" />
       <node concept="2rfBfz" id="4UQF4xbCOaM" role="3EZMnx">
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.jira_integration/com.mbeddr.formal.safety.argument.jira_integration.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.jira_integration/com.mbeddr.formal.safety.argument.jira_integration.mpl
index 92cd4aa24..ded3d1da4 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.jira_integration/com.mbeddr.formal.safety.argument.jira_integration.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.jira_integration/com.mbeddr.formal.safety.argument.jira_integration.mpl
@@ -18,6 +18,7 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">56f134c7-a829-428d-9119-715369c69768(org.mpsqa.treemap.lib)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -67,6 +68,7 @@
     <module reference="e6e482a5-282a-4c6d-862a-311affd0586b(com.mbeddr.formal.safety.argument.jira_integration)" version="0" />
     <module reference="04d81d12-7048-4552-9a53-86a271c0f094(com.mbeddr.formal.safety.argument.visualisation)" version="0" />
     <module reference="e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="fde86f49-830f-414f-9c22-2a9e300eaba6(com.mpsbasics.jira)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.jira_integration/models/com.mbeddr.formal.safety.argument.jira_integration.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.jira_integration/models/com.mbeddr.formal.safety.argument.jira_integration.editor.mps
index 41515814f..b12ec8a28 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.jira_integration/models/com.mbeddr.formal.safety.argument.jira_integration.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.jira_integration/models/com.mbeddr.formal.safety.argument.jira_integration.editor.mps
@@ -7,8 +7,8 @@
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="y8ko" ref="r:800c8fcd-3979-4495-9cb0-a3469f2fa4f6(com.mbeddr.formal.safety.argument.jira_integration.structure)" implicit="true" />
-    <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" implicit="true" />
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
@@ -47,7 +47,7 @@
       </node>
       <node concept="3F0ifn" id="2wSfKqyhUs0" role="3EZMnx">
         <property role="3F0ifm" value=";" />
-        <ref role="1k5W1q" to="xnej:hFDgi_W" resolve="Semicolon" />
+        <ref role="1k5W1q" to="1ks0:hFDgi_W" resolve="Semicolon" />
       </node>
       <node concept="2iRfu4" id="2wSfKqyhUfT" role="2iSdaV" />
     </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/com.mbeddr.formal.safety.argument.modelquery.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/com.mbeddr.formal.safety.argument.modelquery.mpl
index dcaca82fe..6d8164d29 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/com.mbeddr.formal.safety.argument.modelquery.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/com.mbeddr.formal.safety.argument.modelquery.mpl
@@ -87,6 +87,7 @@
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false" scope="generate-into">7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -138,6 +139,7 @@
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="57ecebe4-dfb8-4fef-9175-0008e04a3684(com.mbeddr.formal.safety.argument.modelquery)" version="0" />
     <module reference="e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="7b45fa94-2707-4a1a-9e6a-ce40c4aaf35a(de.itemis.mps.editor.collapsible.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.editor.mps
index 10b49dc65..04c01d8a4 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.editor.mps
@@ -8,6 +8,7 @@
   </languages>
   <imports>
     <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="9br2" ref="r:70aadfb3-8246-45ac-bcd1-b345c7f7cfe4(com.mbeddr.formal.safety.argument.modelquery.structure)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
@@ -152,7 +153,7 @@
     <ref role="1XX52x" to="9br2:1vid6hjrqXc" resolve="ModelChecksContainer" />
     <node concept="3EZMnI" id="5t37uj6_F69" role="2wV5jI">
       <node concept="PMmxH" id="5t37uj6_F6j" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3EZMnI" id="5t37uj6_F6s" role="3EZMnx">
         <node concept="2iRfu4" id="5t37uj6_F6t" role="2iSdaV" />
@@ -252,7 +253,7 @@
         <node concept="l2Vlx" id="y1G8y66Wmp" role="2iSdaV" />
       </node>
       <node concept="PMmxH" id="y1G8y69IvE" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4_pH3zvd_oC" resolve="horizontalLine" />
+        <ref role="PMmxG" to="1ks0:4_pH3zvd_oC" resolve="horizontalLine" />
       </node>
       <node concept="3EZMnI" id="1vid6hjrILp" role="3EZMnx">
         <node concept="VPM3Z" id="1vid6hjrILq" role="3F10Kt" />
@@ -272,7 +273,7 @@
         <node concept="2iRfu4" id="y1G8y69Isn" role="2iSdaV" />
       </node>
       <node concept="PMmxH" id="5t37uj6D0Wm" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4_pH3zvd_oC" resolve="horizontalLine" />
+        <ref role="PMmxG" to="1ks0:4_pH3zvd_oC" resolve="horizontalLine" />
       </node>
       <node concept="3F0ifn" id="5t37uj6CZI$" role="3EZMnx" />
       <node concept="2iRkQZ" id="5t37uj6CZHC" role="2iSdaV" />
@@ -385,7 +386,7 @@
       </node>
       <node concept="3F0ifn" id="y1G8y68MHu" role="3EZMnx">
         <property role="3F0ifm" value="(" />
-        <ref role="1k5W1q" to="xnej:2CEi94dh36z" resolve="ParensStyle" />
+        <ref role="1k5W1q" to="1ks0:2CEi94dh36z" resolve="ParensStyle" />
         <node concept="11L4FC" id="y1G8y68U0c" role="3F10Kt">
           <property role="VOm3f" value="true" />
         </node>
@@ -405,7 +406,7 @@
       <node concept="2iRfu4" id="y1G8y68MHk" role="2iSdaV" />
       <node concept="3F0ifn" id="y1G8y68MHY" role="3EZMnx">
         <property role="3F0ifm" value=")" />
-        <ref role="1k5W1q" to="xnej:2CEi94dh36z" resolve="ParensStyle" />
+        <ref role="1k5W1q" to="1ks0:2CEi94dh36z" resolve="ParensStyle" />
         <node concept="11L4FC" id="y1G8y68U0a" role="3F10Kt">
           <property role="VOm3f" value="true" />
         </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/com.mbeddr.formal.safety.argument.process.artefacts.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/com.mbeddr.formal.safety.argument.process.artefacts.mpl
index f9dfc7eae..e2dbd43e4 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/com.mbeddr.formal.safety.argument.process.artefacts.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/com.mbeddr.formal.safety.argument.process.artefacts.mpl
@@ -19,6 +19,7 @@
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:3bdedd09-792a-4e15-a4db-83970df3ee86:de.itemis.mps.editor.collapsible" version="0" />
@@ -68,6 +69,7 @@
     <module reference="fdecb1e5-875e-41ef-a5fd-4b18f747f204(com.mbeddr.formal.safety.argument.process.artefacts)" version="0" />
     <module reference="e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)" version="0" />
     <module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="7b45fa94-2707-4a1a-9e6a-ce40c4aaf35a(de.itemis.mps.editor.collapsible.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.editor.mps
index 664775989..9c98f7cb0 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.editor.mps
@@ -13,6 +13,7 @@
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="o6i6" ref="r:ba17a867-3973-4713-ba08-31cd6b992c57(com.mbeddr.formal.safety.argument.process.artefacts.util)" />
     <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" implicit="true" />
   </imports>
@@ -677,7 +678,7 @@
     <ref role="1XX52x" to="qsmp:1noKC0JTmPI" resolve="Organization" />
     <node concept="3EZMnI" id="1noKC0JTmTj" role="2wV5jI">
       <node concept="PMmxH" id="3EDV2YKNkya" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3F0ifn" id="1noKC0JTmTM" role="3EZMnx" />
       <node concept="3EZMnI" id="1noKC0JTmVd" role="3EZMnx">
@@ -1487,7 +1488,7 @@
       </node>
       <node concept="3F0ifn" id="7NA168q7HZa" role="3EZMnx">
         <property role="3F0ifm" value=";" />
-        <ref role="1k5W1q" to="xnej:hFDgi_W" resolve="Semicolon" />
+        <ref role="1k5W1q" to="1ks0:hFDgi_W" resolve="Semicolon" />
       </node>
     </node>
   </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/com.mbeddr.formal.safety.argument.process.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/com.mbeddr.formal.safety.argument.process.mpl
index 0ca05af4e..f897fc5e9 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/com.mbeddr.formal.safety.argument.process.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/com.mbeddr.formal.safety.argument.process.mpl
@@ -15,6 +15,7 @@
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:31c91def-a131-41a1-9018-102874f49a12:de.slisson.mps.editor.multiline" version="0" />
@@ -63,6 +64,7 @@
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="8a4ef392-f4b4-43e7-afb5-b071dce8043d(com.mbeddr.formal.safety.argument.process)" version="0" />
     <module reference="e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="7b45fa94-2707-4a1a-9e6a-ce40c4aaf35a(de.itemis.mps.editor.collapsible.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/models/com.mbeddr.formal.safety.argument.process.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/models/com.mbeddr.formal.safety.argument.process.editor.mps
index b79c42ce3..b5bdbaf91 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/models/com.mbeddr.formal.safety.argument.process.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/models/com.mbeddr.formal.safety.argument.process.editor.mps
@@ -10,6 +10,7 @@
   </languages>
   <imports>
     <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="l1gl" ref="r:3c95f73d-aaea-4fdd-b65a-8486222ab2c3(com.mbeddr.formal.safety.argument.process.structure)" implicit="true" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
@@ -168,7 +169,7 @@
       </node>
       <node concept="3F0ifn" id="5uoS5eUXErb" role="3EZMnx">
         <property role="3F0ifm" value=";" />
-        <ref role="1k5W1q" to="xnej:hFDgi_W" resolve="Semicolon" />
+        <ref role="1k5W1q" to="1ks0:hFDgi_W" resolve="Semicolon" />
       </node>
       <node concept="l2Vlx" id="5uoS5eUXEqT" role="2iSdaV" />
     </node>
@@ -186,7 +187,7 @@
     <ref role="1XX52x" to="l1gl:3f8ZVRYgJVz" resolve="Bibliography" />
     <node concept="3EZMnI" id="3GRi4m$qQ5q" role="2wV5jI">
       <node concept="PMmxH" id="2LDKh2uDSuv" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3F0ifn" id="3GRi4m$qQa$" role="3EZMnx" />
       <node concept="2rfBfz" id="3f8ZVRYh45C" role="3EZMnx">
@@ -260,7 +261,7 @@
       </node>
       <node concept="3F0ifn" id="7NA168q7HBb" role="3EZMnx">
         <property role="3F0ifm" value=";" />
-        <ref role="1k5W1q" to="xnej:hFDgi_W" resolve="Semicolon" />
+        <ref role="1k5W1q" to="1ks0:hFDgi_W" resolve="Semicolon" />
       </node>
     </node>
   </node>
@@ -402,7 +403,7 @@
       </node>
       <node concept="3F0ifn" id="7LZ1KAVSg3K" role="3EZMnx">
         <property role="3F0ifm" value=";" />
-        <ref role="1k5W1q" to="xnej:hFDgi_W" resolve="Semicolon" />
+        <ref role="1k5W1q" to="1ks0:hFDgi_W" resolve="Semicolon" />
       </node>
       <node concept="l2Vlx" id="7LZ1KAVSg3L" role="2iSdaV" />
     </node>
@@ -569,7 +570,7 @@
       </node>
       <node concept="3F0ifn" id="7NA168q7Hxa" role="3EZMnx">
         <property role="3F0ifm" value=";" />
-        <ref role="1k5W1q" to="xnej:hFDgi_W" resolve="Semicolon" />
+        <ref role="1k5W1q" to="1ks0:hFDgi_W" resolve="Semicolon" />
       </node>
     </node>
   </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/com.mbeddr.formal.safety.argument.runtime.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/com.mbeddr.formal.safety.argument.runtime.mpl
index 5e4dfc7b0..5a8554b36 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/com.mbeddr.formal.safety.argument.runtime.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/com.mbeddr.formal.safety.argument.runtime.mpl
@@ -21,6 +21,7 @@
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">81f324e1-38b1-44b1-85d2-19432dece3f6(com.mbeddr.formal.safety.argument.runtime.pluginSolution)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -78,6 +79,7 @@
     <module reference="81f324e1-38b1-44b1-85d2-19432dece3f6(com.mbeddr.formal.safety.argument.runtime.pluginSolution)" version="0" />
     <module reference="e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)" version="0" />
     <module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="7b45fa94-2707-4a1a-9e6a-ce40c4aaf35a(de.itemis.mps.editor.collapsible.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/models/com.mbeddr.formal.safety.argument.runtime.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/models/com.mbeddr.formal.safety.argument.runtime.editor.mps
index 809cc304e..cce30518b 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/models/com.mbeddr.formal.safety.argument.runtime.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/models/com.mbeddr.formal.safety.argument.runtime.editor.mps
@@ -14,6 +14,7 @@
     <import index="hyam" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.event(JDK/)" />
     <import index="nbuu" ref="r:d3d83931-eefd-4730-b0d1-738f46c08648(com.mbeddr.formal.safety.argument.runtime.plugin)" />
     <import index="p7rk" ref="r:67c63462-ea88-46dc-b31c-baa1d0218b8f(com.mbeddr.formal.safety.argument.runtime.pluginSolution.utils)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="vdvw" ref="r:0dab1cea-0da9-4395-bdbd-beac207923df(com.mbeddr.formal.safety.argument.runtime.structure)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
@@ -161,7 +162,7 @@
     <ref role="1XX52x" to="vdvw:56pBK14z35C" resolve="RuntimeDataRoot" />
     <node concept="3EZMnI" id="5t37uj6_F69" role="2wV5jI">
       <node concept="PMmxH" id="5t37uj6_F6j" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3F0ifn" id="5t37uj6B1FC" role="3EZMnx" />
       <node concept="3EZMnI" id="56pBK14z36u" role="3EZMnx">
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/com.mbeddr.formal.safety.argument.spi.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/com.mbeddr.formal.safety.argument.spi.mpl
index 65aedb8f5..94f971e15 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/com.mbeddr.formal.safety.argument.spi.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/com.mbeddr.formal.safety.argument.spi.mpl
@@ -16,6 +16,7 @@
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
     <dependency reexport="false">13744753-c81f-424a-9c1b-cf8943bf4e86(jetbrains.mps.lang.sharedConcepts)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -63,6 +64,7 @@
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="1118d03f-f774-4a18-9e75-2357f8563d46(com.mbeddr.formal.safety.argument.spi)" version="0" />
     <module reference="e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="7b45fa94-2707-4a1a-9e6a-ce40c4aaf35a(de.itemis.mps.editor.collapsible.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/models/com.mbeddr.formal.safety.argument.spi.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/models/com.mbeddr.formal.safety.argument.spi.editor.mps
index c5aa08553..47ddd0ed8 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/models/com.mbeddr.formal.safety.argument.spi.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/models/com.mbeddr.formal.safety.argument.spi.editor.mps
@@ -8,6 +8,7 @@
   </languages>
   <imports>
     <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="3xw7" ref="r:03075676-dfa1-4f4e-aef4-a178c9f0fb17(com.mbeddr.formal.safety.argument.spi.structure)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
@@ -67,7 +68,7 @@
     <ref role="1XX52x" to="3xw7:2X_iJQix75f" resolve="SPIContainer" />
     <node concept="3EZMnI" id="5t37uj6_F69" role="2wV5jI">
       <node concept="PMmxH" id="5t37uj6_F6j" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3F0ifn" id="5t37uj6B1FC" role="3EZMnx" />
       <node concept="3F2HdR" id="2X_iJQizVLB" role="3EZMnx">
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/com.mbeddr.formal.safety.argument.visualisation.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/com.mbeddr.formal.safety.argument.visualisation.mpl
index 81686e97c..bd2a74453 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/com.mbeddr.formal.safety.argument.visualisation.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/com.mbeddr.formal.safety.argument.visualisation.mpl
@@ -21,6 +21,7 @@
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -68,6 +69,7 @@
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="04d81d12-7048-4552-9a53-86a271c0f094(com.mbeddr.formal.safety.argument.visualisation)" version="0" />
     <module reference="e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="7b45fa94-2707-4a1a-9e6a-ce40c4aaf35a(de.itemis.mps.editor.collapsible.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/models/com.mbeddr.formal.safety.argument.visualisation.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/models/com.mbeddr.formal.safety.argument.visualisation.editor.mps
index 95a1121ce..d81636e77 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/models/com.mbeddr.formal.safety.argument.visualisation.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/models/com.mbeddr.formal.safety.argument.visualisation.editor.mps
@@ -30,6 +30,7 @@
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="t6h5" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang.reflect(JDK/)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" implicit="true" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
@@ -436,7 +437,7 @@
     <ref role="1XX52x" to="mk71:41Pak$lHRok" resolve="GoalStructureTreeMapConfig" />
     <node concept="3EZMnI" id="5t37uj6_F69" role="2wV5jI">
       <node concept="PMmxH" id="5t37uj6_F6j" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3EZMnI" id="5t37uj6_F6s" role="3EZMnx">
         <node concept="2iRfu4" id="5t37uj6_F6t" role="2iSdaV" />
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 d4cf21a4d..eb6281eec 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/com.mbeddr.formal.safety.gsn.confidence.acp.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/com.mbeddr.formal.safety.gsn.confidence.acp.mpl
@@ -16,6 +16,7 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -69,6 +70,7 @@
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)" version="0" />
     <module reference="00a2e56d-f195-410b-8afe-5a3c7e505658(com.mbeddr.formal.safety.gsn.confidence.acp)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="7b45fa94-2707-4a1a-9e6a-ce40c4aaf35a(de.itemis.mps.editor.collapsible.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.editor.mps
index 04fa2168c..fea4b4b75 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.editor.mps
@@ -8,6 +8,7 @@
   <imports>
     <import index="g35p" ref="r:53f7c624-e35c-46e0-a6cd-4bcccc2b91f5(com.mbeddr.formal.safety.gsn.editor)" />
     <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="kqaf" ref="r:6cc86fc4-3f69-4213-8f49-ef9fcbc7cb5f(com.mbeddr.formal.safety.gsn.confidence.acp.structure)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
@@ -111,7 +112,7 @@
         </node>
         <node concept="3F0ifn" id="7NA168q7JtL" role="3EZMnx">
           <property role="3F0ifm" value=";" />
-          <ref role="1k5W1q" to="xnej:hFDgi_W" resolve="Semicolon" />
+          <ref role="1k5W1q" to="1ks0:hFDgi_W" resolve="Semicolon" />
         </node>
         <node concept="l2Vlx" id="4lbNCDmRjvF" role="2iSdaV" />
       </node>
@@ -155,7 +156,7 @@
     <ref role="1XX52x" to="kqaf:3bh1RFvGk3l" resolve="ConfidenceArgument" />
     <node concept="3EZMnI" id="3GRi4m$qQ5q" role="2wV5jI">
       <node concept="PMmxH" id="2LDKh2uDSuv" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
         <node concept="pkWqt" id="WKGDODOnGl" role="pqm2j">
           <node concept="3clFbS" id="WKGDODOnGm" role="2VODD2">
             <node concept="3clFbF" id="WKGDODOoa6" role="3cqZAp">
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 baa84af32..40b5b4e44 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
@@ -17,6 +17,7 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -71,6 +72,7 @@
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)" version="0" />
     <module reference="d2864642-8e1f-4dd8-b3a6-71f0d9d33ae8(com.mbeddr.formal.safety.gsn.confidence.dempster_shafer)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="7b45fa94-2707-4a1a-9e6a-ce40c4aaf35a(de.itemis.mps.editor.collapsible.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.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 9ec790a09..780be0338 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
@@ -13,8 +13,8 @@
     <import index="gsia" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing.event(JDK/)" />
     <import index="6oah" ref="r:c3ace323-0a57-4f8d-b471-fad629604601(com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.structure)" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
-    <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" implicit="true" />
     <import index="49qe" ref="r:20bb7136-9452-4bac-8213-62deb5681702(com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.behavior)" implicit="true" />
   </imports>
   <registry>
@@ -683,7 +683,7 @@
       </node>
       <node concept="3F0ifn" id="7NA168q7KUR" role="3EZMnx">
         <property role="3F0ifm" value=";" />
-        <ref role="1k5W1q" to="xnej:hFDgi_W" resolve="Semicolon" />
+        <ref role="1k5W1q" to="1ks0:hFDgi_W" resolve="Semicolon" />
       </node>
       <node concept="l2Vlx" id="48_A4oY40jz" role="2iSdaV" />
     </node>
@@ -1162,7 +1162,7 @@
       </node>
       <node concept="3F0ifn" id="7NA168q7JV4" role="3EZMnx">
         <property role="3F0ifm" value=";" />
-        <ref role="1k5W1q" to="xnej:hFDgi_W" resolve="Semicolon" />
+        <ref role="1k5W1q" to="1ks0:hFDgi_W" resolve="Semicolon" />
       </node>
       <node concept="2iRfu4" id="18nEFuhW21M" role="2iSdaV" />
     </node>
@@ -1194,7 +1194,7 @@
       </node>
       <node concept="3F0ifn" id="7NA168q7K9N" role="3EZMnx">
         <property role="3F0ifm" value=";" />
-        <ref role="1k5W1q" to="xnej:hFDgi_W" resolve="Semicolon" />
+        <ref role="1k5W1q" to="1ks0:hFDgi_W" resolve="Semicolon" />
       </node>
       <node concept="2iRfu4" id="18nEFuhW4xq" role="2iSdaV" />
     </node>
@@ -1213,7 +1213,7 @@
       </node>
       <node concept="3F0ifn" id="7NA168q7JBo" role="3EZMnx">
         <property role="3F0ifm" value=";" />
-        <ref role="1k5W1q" to="xnej:hFDgi_W" resolve="Semicolon" />
+        <ref role="1k5W1q" to="1ks0:hFDgi_W" resolve="Semicolon" />
       </node>
       <node concept="l2Vlx" id="18nEFui9g9F" role="2iSdaV" />
     </node>
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 c01edbbdb..d2a06452b 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
@@ -23,6 +23,7 @@
     <dependency reexport="false">e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f89904fb-9486-43a1-865e-5ad0375a8a88:de.itemis.mps.editor.bool" version="0" />
@@ -83,6 +84,7 @@
     <module reference="e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)" version="0" />
     <module reference="e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)" version="0" />
     <module reference="6464626a-ab04-4051-908e-5e8dc75acd78(com.mbeddr.formal.safety.gsn.ext)" version="2" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="7b45fa94-2707-4a1a-9e6a-ce40c4aaf35a(de.itemis.mps.editor.collapsible.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.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 06e4a9ef5..b05e4eb1b 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
@@ -19,6 +19,7 @@
     <import index="lbo2" ref="r:0f81d0ca-0757-4ee3-8a9a-ba988c2c39e3(com.mbeddr.formal.safety.gsn.ext.structure)" />
     <import index="23h6" ref="r:7141fd54-a831-41ba-8753-74008b0b9af4(de.slisson.mps.richtext.editor)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
     <import index="5pac" ref="r:c1e7e8ce-abfe-4b41-9ced-20ab8db5bd60(com.mbeddr.formal.safety.gsn.ext.behavior)" implicit="true" />
@@ -386,7 +387,7 @@
     <ref role="1XX52x" to="lbo2:x1FXqHRAH" resolve="AbstractReusableArgumentFragmentsContainer" />
     <node concept="3EZMnI" id="1qrXfdH2gEM" role="2wV5jI">
       <node concept="PMmxH" id="2LDKh2uDSuv" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
         <node concept="pkWqt" id="WKGDODOnGl" role="pqm2j">
           <node concept="3clFbS" id="WKGDODOnGm" role="2VODD2">
             <node concept="3clFbF" id="WKGDODOoa6" role="3cqZAp">
@@ -1247,7 +1248,7 @@
         <node concept="3F0ifn" id="3EDV2YKGQbk" role="3EZMnx" />
         <node concept="3F0ifn" id="3EDV2YKDnUS" role="3EZMnx">
           <property role="3F0ifm" value="{" />
-          <ref role="1k5W1q" to="xnej:2CEi94dh36z" resolve="ParensStyle" />
+          <ref role="1k5W1q" to="1ks0:2CEi94dh36z" resolve="ParensStyle" />
         </node>
       </node>
       <node concept="3EZMnI" id="3EDV2YKDnUX" role="3EZMnx">
@@ -1294,7 +1295,7 @@
       </node>
       <node concept="3F0ifn" id="3EDV2YKGQbu" role="3EZMnx">
         <property role="3F0ifm" value="}" />
-        <ref role="1k5W1q" to="xnej:2CEi94dh36z" resolve="ParensStyle" />
+        <ref role="1k5W1q" to="1ks0:2CEi94dh36z" resolve="ParensStyle" />
       </node>
       <node concept="2iRkQZ" id="3EDV2YKDnUm" role="2iSdaV" />
       <node concept="3EZMnI" id="3EDV2YKGQct" role="AHCbl">
@@ -1308,7 +1309,7 @@
         <node concept="3F0ifn" id="3EDV2YKGQcx" role="3EZMnx" />
         <node concept="3F0ifn" id="3EDV2YKGQcy" role="3EZMnx">
           <property role="3F0ifm" value="{ ... }" />
-          <ref role="1k5W1q" to="xnej:2CEi94dh36z" resolve="ParensStyle" />
+          <ref role="1k5W1q" to="1ks0:2CEi94dh36z" resolve="ParensStyle" />
         </node>
       </node>
     </node>
@@ -1328,7 +1329,7 @@
       </node>
       <node concept="3F0ifn" id="56pBK14tHBS" role="3EZMnx">
         <property role="3F0ifm" value="(" />
-        <ref role="1k5W1q" to="xnej:2CEi94dh36z" resolve="ParensStyle" />
+        <ref role="1k5W1q" to="1ks0:2CEi94dh36z" resolve="ParensStyle" />
         <node concept="11LMrY" id="56pBK14xa3Z" role="3F10Kt">
           <property role="VOm3f" value="true" />
         </node>
@@ -1357,7 +1358,7 @@
       </node>
       <node concept="3F0ifn" id="56pBK14tHCy" role="3EZMnx">
         <property role="3F0ifm" value=")" />
-        <ref role="1k5W1q" to="xnej:2CEi94dh36z" resolve="ParensStyle" />
+        <ref role="1k5W1q" to="1ks0:2CEi94dh36z" resolve="ParensStyle" />
       </node>
       <node concept="2iRfu4" id="56pBK14tHBA" role="2iSdaV" />
     </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/com.mbeddr.formal.safety.gsn.external_evidence.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/com.mbeddr.formal.safety.gsn.external_evidence.mpl
index 0df711d6c..83c7174fb 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/com.mbeddr.formal.safety.gsn.external_evidence.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/com.mbeddr.formal.safety.gsn.external_evidence.mpl
@@ -21,6 +21,7 @@
     <dependency reexport="false">c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">6b84fb9e-5f09-4a61-bf31-3bfdc54820e3(com.mpsbasics.editor.utils)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f89904fb-9486-43a1-865e-5ad0375a8a88:de.itemis.mps.editor.bool" version="0" />
@@ -73,6 +74,7 @@
     <module reference="e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)" version="0" />
     <module reference="5e7ffa70-8e23-49f4-8c13-a887bba14c36(com.mbeddr.formal.safety.gsn.external_evidence)" version="0" />
     <module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="6b84fb9e-5f09-4a61-bf31-3bfdc54820e3(com.mpsbasics.editor.utils)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.editor.mps
index 121f8fcec..ecd52ac70 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.editor.mps
@@ -19,6 +19,7 @@
     <import index="s9pq" ref="r:8ef909e6-5cd8-45b2-9793-5a70f4829a0a(com.mbeddr.formal.safety.gsn.external_evidence.structure)" />
     <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
     <import index="oqvi" ref="r:d4fc365d-2731-4abe-97d6-18ce4700d823(com.mpsbasics.editor.utils.buttons)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="48kf" ref="r:5f41c82d-84d1-4fb1-a1cf-6697d2365854(com.mbeddr.mpsutil.filepicker.behavior)" implicit="true" />
@@ -1096,7 +1097,7 @@
       <node concept="2iRfu4" id="2ByFloRk$x$" role="2iSdaV" />
       <node concept="3F0ifn" id="7NA168q7Lf3" role="3EZMnx">
         <property role="3F0ifm" value=";" />
-        <ref role="1k5W1q" to="xnej:hFDgi_W" resolve="Semicolon" />
+        <ref role="1k5W1q" to="1ks0:hFDgi_W" resolve="Semicolon" />
       </node>
     </node>
   </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/com.mbeddr.formal.safety.gsn.pdfexport.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/com.mbeddr.formal.safety.gsn.pdfexport.mpl
index 1ddde925e..c1307c5e5 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/com.mbeddr.formal.safety.gsn.pdfexport.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/com.mbeddr.formal.safety.gsn.pdfexport.mpl
@@ -14,6 +14,7 @@
   <dependencies>
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
     <dependency reexport="false">bc7d0863-298c-41cf-984f-a0421e757da5(com.mpsbasics.pdfbox)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -60,6 +61,7 @@
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)" version="0" />
     <module reference="73a95f17-cede-4922-8013-3fd0d236439a(com.mbeddr.formal.safety.gsn.pdfexport)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="bc7d0863-298c-41cf-984f-a0421e757da5(com.mpsbasics.pdfbox)" version="0" />
     <module reference="ece26728-2885-4b26-9f61-67d2821fc361(com.mpsbasics.pdfexporter)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/models/com.mbeddr.formal.safety.gsn.pdfexport.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/models/com.mbeddr.formal.safety.gsn.pdfexport.editor.mps
index ce4699572..173791387 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/models/com.mbeddr.formal.safety.gsn.pdfexport.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/models/com.mbeddr.formal.safety.gsn.pdfexport.editor.mps
@@ -8,9 +8,9 @@
   </languages>
   <imports>
     <import index="e4i3" ref="r:ba0a53f2-78bd-4230-9576-68a1e8855e28(com.mpsbasics.pdfexporter.editor)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="z1f2" ref="r:b350b49f-d62a-46db-826a-8c341f599d9e(com.mbeddr.formal.safety.gsn.pdfexport.structure)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
-    <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" implicit="true" />
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
@@ -67,7 +67,7 @@
       </node>
       <node concept="3F0ifn" id="3TNxfDZ5yHn" role="3EZMnx">
         <property role="3F0ifm" value=";" />
-        <ref role="1k5W1q" to="xnej:hFDgi_W" resolve="Semicolon" />
+        <ref role="1k5W1q" to="1ks0:hFDgi_W" resolve="Semicolon" />
       </node>
     </node>
   </node>
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 3c594bc32..1116166e4 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
@@ -25,6 +25,7 @@
     <dependency reexport="false">8da51702-0e05-44c8-96db-8f11d1457c0c(com.mpsbasics.snode.utils)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">6b84fb9e-5f09-4a61-bf31-3bfdc54820e3(com.mpsbasics.editor.utils)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:120e1c9d-4e27-4478-b2af-b2c3bd3850b0:com.mbeddr.mpsutil.editor.querylist" version="0" />
@@ -83,6 +84,7 @@
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)" version="0" />
     <module reference="e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="6b84fb9e-5f09-4a61-bf31-3bfdc54820e3(com.mpsbasics.editor.utils)" version="0" />
     <module reference="8da51702-0e05-44c8-96db-8f11d1457c0c(com.mpsbasics.snode.utils)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.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 69983b703..6f568fc60 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
@@ -47,6 +47,7 @@
     <import index="oqvi" ref="r:d4fc365d-2731-4abe-97d6-18ce4700d823(com.mpsbasics.editor.utils.buttons)" />
     <import index="1njx" ref="1144260c-e9a5-49a2-9add-39a1a1a7077e/java:com.mxgraph.view(de.itemis.mps.editor.diagram.runtime/)" />
     <import index="r3rm" ref="r:7fc96130-6279-4a55-aeeb-422a6879539d(de.itemis.mps.editor.diagram.runtime.jgraph)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
     <import index="tbr6" ref="r:6a005c26-87c0-43c4-8cf3-49ffba1099df(de.slisson.mps.richtext.behavior)" implicit="true" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
@@ -833,7 +834,7 @@
     <ref role="1XX52x" to="py52:3GRi4m$qNsQ" resolve="GoalStructure" />
     <node concept="3EZMnI" id="3GRi4m$qQ5q" role="2wV5jI">
       <node concept="PMmxH" id="2LDKh2uDSuv" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
         <node concept="pkWqt" id="WKGDODOnGl" role="pqm2j">
           <node concept="3clFbS" id="WKGDODOnGm" role="2VODD2">
             <node concept="3clFbF" id="WKGDODOoa6" role="3cqZAp">
@@ -5845,7 +5846,7 @@
     <ref role="1XX52x" to="py52:3GRi4m$qNsQ" resolve="GoalStructure" />
     <node concept="3EZMnI" id="5uFV_KKBiZL" role="2wV5jI">
       <node concept="PMmxH" id="5uFV_KKBiZM" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
         <node concept="pkWqt" id="5uFV_KKBiZN" role="pqm2j">
           <node concept="3clFbS" id="5uFV_KKBiZO" role="2VODD2">
             <node concept="3clFbF" id="5uFV_KKBiZP" role="3cqZAp">
@@ -10396,7 +10397,7 @@
     </node>
     <node concept="3EZMnI" id="7olAlesPjYr" role="2wV5jI">
       <node concept="PMmxH" id="7olAlesPjYs" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
         <node concept="pkWqt" id="7olAlesPjYt" role="pqm2j">
           <node concept="3clFbS" id="7olAlesPjYu" role="2VODD2">
             <node concept="3clFbF" id="7olAlesPjYv" role="3cqZAp">
@@ -11726,7 +11727,7 @@
     <ref role="1XX52x" to="py52:3GRi4m$qNsQ" resolve="GoalStructure" />
     <node concept="3EZMnI" id="4Cms47V7bQb" role="2wV5jI">
       <node concept="PMmxH" id="4Cms47V7bQc" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
         <node concept="pkWqt" id="4Cms47V7bQd" role="pqm2j">
           <node concept="3clFbS" id="4Cms47V7bQe" role="2VODD2">
             <node concept="3clFbF" id="4Cms47V7bQf" role="3cqZAp">
@@ -13024,7 +13025,7 @@
       <node concept="2iRfu4" id="2p23w$d1hPE" role="2iSdaV" />
       <node concept="3F0ifn" id="7NA168q7J5k" role="3EZMnx">
         <property role="3F0ifm" value=";" />
-        <ref role="1k5W1q" to="xnej:hFDgi_W" resolve="Semicolon" />
+        <ref role="1k5W1q" to="1ks0:hFDgi_W" resolve="Semicolon" />
       </node>
     </node>
   </node>
@@ -13740,7 +13741,7 @@
     </node>
     <node concept="3EZMnI" id="3EDV2YKNky9" role="2wV5jI">
       <node concept="PMmxH" id="3EDV2YKNkya" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
         <node concept="pkWqt" id="3EDV2YKNkyb" role="pqm2j">
           <node concept="3clFbS" id="3EDV2YKNkyc" role="2VODD2">
             <node concept="3clFbF" id="3EDV2YKNkyd" role="3cqZAp">
@@ -14266,7 +14267,7 @@
       </node>
       <node concept="3F0ifn" id="7NA168q5QLZ" role="3EZMnx">
         <property role="3F0ifm" value=";" />
-        <ref role="1k5W1q" to="xnej:hFDgi_W" resolve="Semicolon" />
+        <ref role="1k5W1q" to="1ks0:hFDgi_W" resolve="Semicolon" />
       </node>
       <node concept="2iRfu4" id="7NA168q5x7o" role="2iSdaV" />
     </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/com.mbeddr.formal.safety.hara.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/com.mbeddr.formal.safety.hara.mpl
index e0529358c..f5773d83d 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/com.mbeddr.formal.safety.hara.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/com.mbeddr.formal.safety.hara.mpl
@@ -13,6 +13,7 @@
   <accessoryModels />
   <dependencies>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:7e450f4e-1ac3-41ef-a851-4598161bdb94:de.slisson.mps.tables" version="0" />
@@ -60,6 +61,7 @@
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="17da266c-02d9-4bbd-b69b-8a656b49f45c(com.mbeddr.formal.safety.hara)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.editor.mps
index b774df282..308b8d4a3 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.editor.mps
@@ -11,6 +11,7 @@
     <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
     <import index="cjwq" ref="r:7e1f4da1-19b3-4ceb-bcab-0237eb7a50b7(com.mbeddr.formal.safety.hara.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
@@ -102,7 +103,7 @@
     <ref role="1XX52x" to="cjwq:7TjUbLQ4519" resolve="HazardsList" />
     <node concept="3EZMnI" id="7TjUbLQ452l" role="2wV5jI">
       <node concept="PMmxH" id="2LDKh2uDSuv" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3F0ifn" id="7TjUbLQ45uH" role="3EZMnx" />
       <node concept="2rfBfz" id="7TjUbLQ45uW" role="3EZMnx">
@@ -201,7 +202,7 @@
     <ref role="1XX52x" to="cjwq:2hOvri9WL4A" resolve="Losses" />
     <node concept="3EZMnI" id="2hOvri9WL5z" role="2wV5jI">
       <node concept="PMmxH" id="2hOvri9WL5$" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3F0ifn" id="2hOvri9WL5_" role="3EZMnx" />
       <node concept="2rfBfz" id="2hOvri9WL5A" role="3EZMnx">
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/com.mbeddr.formal.safety.iso26262.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/com.mbeddr.formal.safety.iso26262.mpl
index 139ad680c..e6fd48b50 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/com.mbeddr.formal.safety.iso26262.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/com.mbeddr.formal.safety.iso26262.mpl
@@ -15,6 +15,7 @@
     <dependency reexport="false">17da266c-02d9-4bbd-b69b-8a656b49f45c(com.mbeddr.formal.safety.hara)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:31c91def-a131-41a1-9018-102874f49a12:de.slisson.mps.editor.multiline" version="0" />
@@ -66,6 +67,7 @@
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="17da266c-02d9-4bbd-b69b-8a656b49f45c(com.mbeddr.formal.safety.hara)" version="0" />
     <module reference="a798113f-e2cd-4e21-a8e2-ca1903cb9c43(com.mbeddr.formal.safety.iso26262)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.editor.mps
index 05ea3a8e0..b175b3b25 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.editor.mps
@@ -10,6 +10,7 @@
   <imports>
     <import index="cjwq" ref="r:7e1f4da1-19b3-4ceb-bcab-0237eb7a50b7(com.mbeddr.formal.safety.hara.structure)" />
     <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="1w8j" ref="r:0631ef51-dd11-46fa-a4db-001e68da09c6(com.mbeddr.formal.safety.iso26262.structure)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="tbr6" ref="r:6a005c26-87c0-43c4-8cf3-49ffba1099df(de.slisson.mps.richtext.behavior)" implicit="true" />
@@ -243,7 +244,7 @@
             <ref role="1NtTu8" to="1w8j:4JYWwihCjpA" resolve="severityRationale" />
             <node concept="3F0ifn" id="4JYWwihCu0w" role="2ruayu">
               <property role="3F0ifm" value="none" />
-              <ref role="1k5W1q" to="xnej:2CEi94e3iKI" resolve="PassiveTextStyle" />
+              <ref role="1k5W1q" to="1ks0:2CEi94e3iKI" resolve="PassiveTextStyle" />
             </node>
           </node>
           <node concept="1A0rlU" id="4JYWwihCUFU" role="2recC9">
@@ -280,7 +281,7 @@
             <ref role="1NtTu8" to="1w8j:4JYWwihCjpR" resolve="controlabilityRationale" />
             <node concept="3F0ifn" id="4JYWwihCu0y" role="2ruayu">
               <property role="3F0ifm" value="none" />
-              <ref role="1k5W1q" to="xnej:2CEi94e3iKI" resolve="PassiveTextStyle" />
+              <ref role="1k5W1q" to="1ks0:2CEi94e3iKI" resolve="PassiveTextStyle" />
             </node>
           </node>
           <node concept="1A0rlU" id="4JYWwihCUFB" role="2recC9">
@@ -368,7 +369,7 @@
     <ref role="1XX52x" to="1w8j:55oVyA0ls9z" resolve="OperationalSituationsCatalogue" />
     <node concept="3EZMnI" id="2hOvri9WL5z" role="2wV5jI">
       <node concept="PMmxH" id="2hOvri9WL5$" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3F0ifn" id="2hOvri9WL5_" role="3EZMnx" />
       <node concept="2rfBfz" id="2hOvri9WL5A" role="3EZMnx">
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 6c91c115f..eeac2709a 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
@@ -20,6 +20,7 @@
     <dependency reexport="false">e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)</dependency>
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">6b84fb9e-5f09-4a61-bf31-3bfdc54820e3(com.mpsbasics.editor.utils)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="1" />
@@ -80,6 +81,7 @@
     <module reference="e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)" version="0" />
     <module reference="17da266c-02d9-4bbd-b69b-8a656b49f45c(com.mbeddr.formal.safety.hara)" version="0" />
     <module reference="7e777b53-0a6b-4719-b36d-10475788d49f(com.mbeddr.formal.safety.stamp)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="6b84fb9e-5f09-4a61-bf31-3bfdc54820e3(com.mpsbasics.editor.utils)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
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 8d70ad580..3e467c3ee 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
@@ -22,6 +22,7 @@
     <import index="95j3" ref="r:b59c48c6-3515-4a72-8146-4b8c723b8307(com.mbeddr.formal.base.diagram_utils)" />
     <import index="bewr" ref="r:a5d87024-d7b0-459e-b0ec-a9c089196f41(com.mbeddr.formal.safety.stamp.structure)" />
     <import index="xm38" ref="r:d81a00b5-7941-4066-9929-d2d2283d4215(com.mbeddr.formal.base.tooling.vcs)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" implicit="true" />
@@ -497,7 +498,7 @@
     <ref role="1XX52x" to="bewr:3HVC1H6VUjH" resolve="FunctionalControlStructure" />
     <node concept="3EZMnI" id="3GRi4m$qQ5q" role="2wV5jI">
       <node concept="PMmxH" id="2LDKh2uDSuv" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3F0ifn" id="3GRi4m$qQa$" role="3EZMnx" />
       <node concept="PMmxH" id="4bL3rTRLlvM" role="3EZMnx">
@@ -1371,7 +1372,7 @@
     <ref role="1XX52x" to="bewr:1JhvKLLO08a" resolve="UnsafeControlAnalysis" />
     <node concept="3EZMnI" id="1JhvKLLO08I" role="2wV5jI">
       <node concept="PMmxH" id="1JhvKLLO08P" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3F0ifn" id="1JhvKLLO08R" role="3EZMnx" />
       <node concept="3EZMnI" id="1JhvKLLOic6" role="3EZMnx">
@@ -1765,7 +1766,7 @@
     <ref role="1XX52x" to="bewr:6RZi9iiAzbi" resolve="LossScenarios" />
     <node concept="3EZMnI" id="6RZi9iiAzdT" role="2wV5jI">
       <node concept="PMmxH" id="1dsoBXVMQn8" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="2rfBfz" id="6RZi9iiAze4" role="3EZMnx">
         <node concept="2reSaE" id="6RZi9iiAze5" role="2rf8GZ">
@@ -1817,7 +1818,7 @@
     <ref role="1XX52x" to="bewr:EZNLLOzOsH" resolve="ContextsCatalogue" />
     <node concept="3EZMnI" id="EZNLLOzTUG" role="2wV5jI">
       <node concept="PMmxH" id="EZNLLOzTUH" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="2rfBfz" id="EZNLLOzTUI" role="3EZMnx">
         <node concept="2reSaE" id="EZNLLOzTUJ" role="2rf8GZ">
@@ -2452,7 +2453,7 @@
     </node>
     <node concept="3EZMnI" id="4bL3rTRE7sr" role="2wV5jI">
       <node concept="PMmxH" id="4bL3rTRE7ss" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4gtLUSMLjsp" resolve="HeaderComponent" />
+        <ref role="PMmxG" to="1ks0:4gtLUSMLjsp" resolve="HeaderComponent" />
       </node>
       <node concept="3F0ifn" id="4bL3rTRE7st" role="3EZMnx" />
       <node concept="PMmxH" id="4bL3rTRKGkc" role="3EZMnx">
@@ -2603,7 +2604,7 @@
         </node>
         <node concept="3F0ifn" id="4bL3rTRH4Y7" role="3EZMnx">
           <property role="3F0ifm" value=";" />
-          <ref role="1k5W1q" to="xnej:hFDgi_W" resolve="Semicolon" />
+          <ref role="1k5W1q" to="1ks0:hFDgi_W" resolve="Semicolon" />
         </node>
         <node concept="l2Vlx" id="4bL3rTRFUhR" role="2iSdaV" />
       </node>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps
index 4a3b32502..3f780b7dd 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps
@@ -608,6 +608,9 @@
       <node concept="m$_yC" id="hKYaKNdjV$" role="m$_yJ">
         <ref role="m$_y1" to="90a9:3$A0JaN5ezp" resolve="MPS.ThirdParty" />
       </node>
+      <node concept="m$_yC" id="5Gu43O52lhT" role="m$_yJ">
+        <ref role="m$_y1" to="90a9:6SVXTgIe8wD" resolve="de.itemis.mps.celllayout" />
+      </node>
     </node>
     <node concept="m$_wf" id="2MrvZqtGPGn" role="3989C9">
       <property role="m$_wk" value="com.mpsbasics.testutils" />
@@ -2671,6 +2674,71 @@
           </node>
         </node>
       </node>
+      <node concept="1E1JtD" id="4lJSf3LkfPw" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="com.mpsbasics.core" />
+        <property role="3LESm3" value="792be022-0a7a-4b28-bfd8-b1b2d347b772" />
+        <node concept="398BVA" id="4lJSf3Lkg39" role="3LF7KH">
+          <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
+          <node concept="2Ry0Ak" id="4lJSf3LkggM" role="iGT6I">
+            <property role="2Ry0Am" value="languages" />
+            <node concept="2Ry0Ak" id="4lJSf3LkgFZ" role="2Ry0An">
+              <property role="2Ry0Am" value="com.mpsbasics.core" />
+              <node concept="2Ry0Ak" id="4lJSf3Lkh7c" role="2Ry0An">
+                <property role="2Ry0Am" value="com.mpsbasics.core.mpl" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4lJSf3Lkhx6" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3Lkhx7" role="1SiIV1">
+            <ref role="3bR37D" to="90a9:6SVXTgIejl1" resolve="de.itemis.mps.editor.celllayout.runtime" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4lJSf3Lkhx8" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3Lkhx9" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbJt" resolve="jetbrains.mps.ide.platform" />
+          </node>
+        </node>
+        <node concept="1BupzO" id="4lJSf3Lkhxl" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="4lJSf3Lkhxm" role="1HemKq">
+            <node concept="398BVA" id="4lJSf3Lkhxa" role="3LXTmr">
+              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
+              <node concept="2Ry0Ak" id="4lJSf3Lkhxb" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="4lJSf3Lkhxc" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mpsbasics.core" />
+                  <node concept="2Ry0Ak" id="4lJSf3Lkhxd" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="4lJSf3Lkhxn" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
+        <node concept="3rtmxn" id="4lJSf3LkibE" role="3bR31x">
+          <node concept="3LXTmp" id="4lJSf3LkibF" role="3rtmxm">
+            <node concept="398BVA" id="4lJSf3LkibG" role="3LXTmr">
+              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
+              <node concept="2Ry0Ak" id="4lJSf3LkibH" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="4lJSf3LkibI" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mpsbasics.core" />
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="4lJSf3LkibK" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2G$12M" id="2MrvZqtGQDM" role="3989C9">
       <property role="TrG5h" value="com.mpsbasics.testutils" />
@@ -2938,6 +3006,11 @@
             <ref role="1Busuk" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
           </node>
         </node>
+        <node concept="1SiIV0" id="5Gu43O52kV3" role="3bR37C">
+          <node concept="3bR9La" id="5Gu43O52kV4" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="84ljAGyXk7" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -3033,6 +3106,11 @@
             <ref role="3bR37D" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
           </node>
         </node>
+        <node concept="1SiIV0" id="5Gu43O52kVt" role="3bR37C">
+          <node concept="3bR9La" id="5Gu43O52kVu" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="6hyv0iVPlFO" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -3233,6 +3311,11 @@
             <ref role="3bR37D" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
           </node>
         </node>
+        <node concept="1SiIV0" id="5Gu43O52kVP" role="3bR37C">
+          <node concept="3bR9La" id="5Gu43O52kVQ" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="6hyv0iVPlEh" role="3989C9">
@@ -3394,6 +3477,11 @@
             <ref role="3bR37D" node="2u7UHDCnPLY" resolve="com.mpsbasics.project.utils" />
           </node>
         </node>
+        <node concept="1SiIV0" id="5Gu43O52kWf" role="3bR37C">
+          <node concept="3bR9La" id="5Gu43O52kWg" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="6hyv0iVPlG4" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -3547,6 +3635,11 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
           </node>
         </node>
+        <node concept="1SiIV0" id="5Gu43O52kWB" role="3bR37C">
+          <node concept="3bR9La" id="5Gu43O52kWC" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="6hyv0iVPlG7" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -3661,6 +3754,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="5Gu43O52kWO" role="3bR37C">
+          <node concept="3bR9La" id="5Gu43O52kWP" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="6hyv0iVPlG9" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -4106,6 +4204,11 @@
             <ref role="3bR37D" to="90a9:6SVXTgIejl1" resolve="de.itemis.mps.editor.celllayout.runtime" />
           </node>
         </node>
+        <node concept="1SiIV0" id="5Gu43O52kXW" role="3bR37C">
+          <node concept="3bR9La" id="5Gu43O52kXX" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="xDU_PQJHwS" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -4255,6 +4358,11 @@
             <ref role="1Busuk" node="6hyv0iVPlG3" resolve="com.mbeddr.formal.base" />
           </node>
         </node>
+        <node concept="1SiIV0" id="5Gu43O52kYx" role="3bR37C">
+          <node concept="3bR9La" id="5Gu43O52kYy" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="5FTX57fE1T2" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -4410,6 +4518,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="5Gu43O52kYT" role="3bR37C">
+          <node concept="3bR9La" id="5Gu43O52kYU" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="6hyv0iVPlEj" role="3989C9">
@@ -4547,6 +4660,11 @@
             <ref role="3bR37D" node="2u7UHDCnRuK" resolve="com.mpsbasics.editor.utils" />
           </node>
         </node>
+        <node concept="1SiIV0" id="5Gu43O52kZ6" role="3bR37C">
+          <node concept="3bR9La" id="5Gu43O52kZ7" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="6hyv0iVPlGu" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -4652,6 +4770,11 @@
             <ref role="3bR37D" node="2u7UHDCnRuK" resolve="com.mpsbasics.editor.utils" />
           </node>
         </node>
+        <node concept="1SiIV0" id="5Gu43O52kZj" role="3bR37C">
+          <node concept="3bR9La" id="5Gu43O52kZk" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="6hyv0iVPlGv" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -4780,6 +4903,11 @@
             <ref role="1Busuk" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
           </node>
         </node>
+        <node concept="1SiIV0" id="5Gu43O52kZw" role="3bR37C">
+          <node concept="3bR9La" id="5Gu43O52kZx" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="1UGKBYPyaLN" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -5103,6 +5231,11 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6LfQ" resolve="jetbrains.mps.kernel" />
           </node>
         </node>
+        <node concept="1SiIV0" id="5Gu43O52l0e" role="3bR37C">
+          <node concept="3bR9La" id="5Gu43O52l0f" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="5YWtEMPIdDz" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -5198,6 +5331,11 @@
             <ref role="3bR37D" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
           </node>
         </node>
+        <node concept="1SiIV0" id="5Gu43O52l0r" role="3bR37C">
+          <node concept="3bR9La" id="5Gu43O52l0s" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="4eD_5l3ft1H" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -5286,6 +5424,11 @@
             <ref role="1Busuk" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
           </node>
         </node>
+        <node concept="1SiIV0" id="5Gu43O52l0C" role="3bR37C">
+          <node concept="3bR9La" id="5Gu43O52l0D" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="4eD_5l3aLAv" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -5374,6 +5517,11 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
           </node>
         </node>
+        <node concept="1SiIV0" id="5Gu43O52l0P" role="3bR37C">
+          <node concept="3bR9La" id="5Gu43O52l0Q" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="4SCnVTcAZiY" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -5648,6 +5796,11 @@
             <ref role="1E1Vl2" to="ffeo:7Kfy9QB6L9O" resolve="jetbrains.mps.lang.smodel" />
           </node>
         </node>
+        <node concept="1SiIV0" id="5Gu43O52l1q" role="3bR37C">
+          <node concept="3bR9La" id="5Gu43O52l1r" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="6VBHnHRiYOJ" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -6151,6 +6304,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="5Gu43O52l2S" role="3bR37C">
+          <node concept="3bR9La" id="5Gu43O52l2T" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="jPgKPEIhOV" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -6251,6 +6409,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="5Gu43O52l35" role="3bR37C">
+          <node concept="3bR9La" id="5Gu43O52l36" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="3h2IzuaJeCO" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -6342,6 +6505,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="5Gu43O52l3i" role="3bR37C">
+          <node concept="3bR9La" id="5Gu43O52l3j" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="6i5G5_YTYIe" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -6443,6 +6611,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="5Gu43O52l3v" role="3bR37C">
+          <node concept="3bR9La" id="5Gu43O52l3w" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="6i5G5_YU0N4" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -6528,6 +6701,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="5Gu43O52l3G" role="3bR37C">
+          <node concept="3bR9La" id="5Gu43O52l3H" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="6i5G5_YU2S5" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -6769,6 +6947,11 @@
             <ref role="1Busuk" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
           </node>
         </node>
+        <node concept="1SiIV0" id="5Gu43O52l4f" role="3bR37C">
+          <node concept="3bR9La" id="5Gu43O52l4g" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="6hyv0iVPlG_" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -6844,6 +7027,11 @@
             <ref role="3bR37D" to="ffeo:3HV74$ebibC" resolve="jetbrains.mps.lang.text" />
           </node>
         </node>
+        <node concept="1SiIV0" id="5Gu43O52l4s" role="3bR37C">
+          <node concept="3bR9La" id="5Gu43O52l4t" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="20ZHrRkGxlv" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -6909,6 +7097,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="5Gu43O52l4D" role="3bR37C">
+          <node concept="3bR9La" id="5Gu43O52l4E" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="6hyv0iVPlGA" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -7012,6 +7205,11 @@
             <ref role="3bR37D" node="2u7UHDCnRuK" resolve="com.mpsbasics.editor.utils" />
           </node>
         </node>
+        <node concept="1SiIV0" id="5Gu43O52l4Q" role="3bR37C">
+          <node concept="3bR9La" id="5Gu43O52l4R" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="551EivYxYjM" role="3989C9">
@@ -7208,6 +7406,11 @@
             <ref role="3bR37D" node="2u7UHDCnRuK" resolve="com.mpsbasics.editor.utils" />
           </node>
         </node>
+        <node concept="1SiIV0" id="5Gu43O52l5e" role="3bR37C">
+          <node concept="3bR9La" id="5Gu43O52l5f" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="3rkUgzovbK_" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -7477,6 +7680,11 @@
             <ref role="3bR37D" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
           </node>
         </node>
+        <node concept="1SiIV0" id="5Gu43O52l5Y" role="3bR37C">
+          <node concept="3bR9La" id="5Gu43O52l5Z" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="3rkUgzovj$7" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -7552,6 +7760,11 @@
             <ref role="3bR37D" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
           </node>
         </node>
+        <node concept="1SiIV0" id="5Gu43O52l6b" role="3bR37C">
+          <node concept="3bR9La" id="5Gu43O52l6c" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="6lmI$FzXIac" role="2G$12L">
         <property role="BnDLt" value="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.rcp.pluginSolution/com.fasten.safety.rcp.pluginSolution.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.rcp.pluginSolution/com.fasten.safety.rcp.pluginSolution.msd
index 8bf1a9fa3..36ff75c3a 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.rcp.pluginSolution/com.fasten.safety.rcp.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.rcp.pluginSolution/com.fasten.safety.rcp.pluginSolution.msd
@@ -30,6 +30,7 @@
     <dependency reexport="false">65ed2ac6-4499-4751-951e-3819684a4b8d(com.fasten.req.ontology)</dependency>
     <dependency reexport="false">3460ac43-6f59-4f61-b134-9fa2f799c2d3(com.mbeddr.formal.req.scenarios)</dependency>
     <dependency reexport="false">81f6a079-965e-4523-87c3-8e6194f66585(com.fasten.base.msc)</dependency>
+    <dependency reexport="false">6f31bc85-cbcc-4dcf-ada4-35da43e6832c(com.symo.plantuml)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:c38abce1-4c09-44cb-9ebf-2a764e824bb5:com.mbeddr.mpsutil.actionsfilter" version="0" />
@@ -86,6 +87,7 @@
     <module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
     <module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
     <module reference="732373f1-0d48-4122-bb43-c1606db4baca(com.mbeddr.mpsutil.projectview.runtime)" version="0" />
+    <module reference="6f31bc85-cbcc-4dcf-ada4-35da43e6832c(com.symo.plantuml)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="7b45fa94-2707-4a1a-9e6a-ce40c4aaf35a(de.itemis.mps.editor.collapsible.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.rcp.pluginSolution/models/com.fasten.safety.rcp.pluginSolution.plugin.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.rcp.pluginSolution/models/com.fasten.safety.rcp.pluginSolution.plugin.mps
index 82643ec34..b007df848 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.rcp.pluginSolution/models/com.fasten.safety.rcp.pluginSolution.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.rcp.pluginSolution/models/com.fasten.safety.rcp.pluginSolution.plugin.mps
@@ -31,6 +31,7 @@
     <import index="6wa3" ref="r:fe70b1ce-4411-47cc-b7d1-2d3fab0737d6(com.fasten.req.ontology.structure)" />
     <import index="uiqf" ref="r:284d7186-e902-4338-a3e0-8017019deafe(com.mbeddr.formal.req.scenarios.structure)" />
     <import index="6jj4" ref="r:77d7f4e3-953a-49ab-a2c5-934fc706bf67(com.fasten.base.msc.structure)" />
+    <import index="udwj" ref="r:3cfd1ac4-92be-4123-8876-78cf444bfbcb(com.symo.plantuml.structure)" />
     <import index="31cb" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.extapi.module(MPS.Core/)" implicit="true" />
     <import index="uhdf" ref="r:30978237-741d-4b0b-ac0b-6600a1c5c14f(com.mbeddr.mpsutil.projectview.runtime.tree)" implicit="true" />
     <import index="71xd" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.tools(MPS.Platform/)" implicit="true" />
@@ -1040,6 +1041,29 @@
               </node>
             </node>
           </node>
+          <node concept="tC5Ba" id="4lJSf3LhyGH" role="ftvYc">
+            <property role="TrG5h" value="SystemModels" />
+            <property role="1XlLyE" value="true" />
+            <property role="2f7twF" value="System Models" />
+            <property role="2pbE17" value="S" />
+            <node concept="ftmFs" id="4lJSf3LhyGI" role="ftER_">
+              <node concept="tCFHf" id="4lJSf3LhyGJ" role="ftvYc">
+                <ref role="tCJdB" to="8js5:BKGoaZN_d1" resolve="FASTENNewRootNode" />
+                <node concept="Xl_RD" id="4lJSf3LhyGK" role="2J__8u">
+                  <property role="Xl_RC" value="System Model (PlantUML)" />
+                </node>
+                <node concept="35c_gC" id="4lJSf3LhyGL" role="2J__8u">
+                  <ref role="35c_gD" to="udwj:1I7wo92Vbhy" resolve="PlantUmlRoot" />
+                </node>
+                <node concept="37shsh" id="4lJSf3LhyGM" role="2J__8u">
+                  <node concept="1dCxOk" id="4lJSf3LhTgX" role="37shsm">
+                    <property role="1XweGW" value="114acb95-50b2-4e9b-81c6-e0c665740eae" />
+                    <property role="1XxBO9" value="fasten.symo.plantuml" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
         </node>
       </node>
       <node concept="tC5Ba" id="7A06dcUGeRu" role="ftvYc">
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps
index 30105df0b..feac842fe 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps
@@ -817,6 +817,9 @@
       <node concept="m$_yC" id="hKYaKNdlcG" role="m$_yJ">
         <ref role="m$_y1" to="90a9:3$A0JaN5ezp" resolve="MPS.ThirdParty" />
       </node>
+      <node concept="m$_yC" id="4lJSf3Lkjhx" role="m$_yJ">
+        <ref role="m$_y1" to="90a9:6SVXTgIe8wD" resolve="de.itemis.mps.celllayout" />
+      </node>
     </node>
     <node concept="m$_wf" id="2MrvZqtDsQE" role="3989C9">
       <property role="m$_wk" value="com.mpsbasics.testutils" />
@@ -1145,6 +1148,9 @@
       <node concept="m$_yC" id="7yAshxDrVzA" role="m$_yJ">
         <ref role="m$_y1" node="7he_lUuoSVd" resolve="com.mbeddr.formal.spin" />
       </node>
+      <node concept="m$_yC" id="4lJSf3LigyM" role="m$_yJ">
+        <ref role="m$_y1" node="1k6eCQnEZzO" resolve="fasten.symo" />
+      </node>
       <node concept="m$_yC" id="647GT0tL_fM" role="m$_yJ">
         <ref role="m$_y1" to="90a9:1Rj3F434oop" resolve="com.mbeddr.mpsutil.treenotations" />
       </node>
@@ -2955,6 +2961,71 @@
           </node>
         </node>
       </node>
+      <node concept="1E1JtD" id="4lJSf3LkfPw" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="com.mpsbasics.core" />
+        <property role="3LESm3" value="792be022-0a7a-4b28-bfd8-b1b2d347b772" />
+        <node concept="398BVA" id="4lJSf3Lkg39" role="3LF7KH">
+          <ref role="398BVh" node="7he_lUum_$u" resolve="mpsbasics.code" />
+          <node concept="2Ry0Ak" id="4lJSf3LkggM" role="iGT6I">
+            <property role="2Ry0Am" value="languages" />
+            <node concept="2Ry0Ak" id="4lJSf3LkgFZ" role="2Ry0An">
+              <property role="2Ry0Am" value="com.mpsbasics.core" />
+              <node concept="2Ry0Ak" id="4lJSf3Lkh7c" role="2Ry0An">
+                <property role="2Ry0Am" value="com.mpsbasics.core.mpl" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4lJSf3Lkhx6" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3Lkhx7" role="1SiIV1">
+            <ref role="3bR37D" to="90a9:6SVXTgIejl1" resolve="de.itemis.mps.editor.celllayout.runtime" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4lJSf3Lkhx8" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3Lkhx9" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbJt" resolve="jetbrains.mps.ide.platform" />
+          </node>
+        </node>
+        <node concept="1BupzO" id="4lJSf3Lkhxl" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="4lJSf3Lkhxm" role="1HemKq">
+            <node concept="398BVA" id="4lJSf3Lkhxa" role="3LXTmr">
+              <ref role="398BVh" node="7he_lUum_$u" resolve="mpsbasics.code" />
+              <node concept="2Ry0Ak" id="4lJSf3Lkhxb" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="4lJSf3Lkhxc" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mpsbasics.core" />
+                  <node concept="2Ry0Ak" id="4lJSf3Lkhxd" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="4lJSf3Lkhxn" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
+        <node concept="3rtmxn" id="4lJSf3LkibE" role="3bR31x">
+          <node concept="3LXTmp" id="4lJSf3LkibF" role="3rtmxm">
+            <node concept="398BVA" id="4lJSf3LkibG" role="3LXTmr">
+              <ref role="398BVh" node="7he_lUum_$u" resolve="mpsbasics.code" />
+              <node concept="2Ry0Ak" id="4lJSf3LkibH" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="4lJSf3LkibI" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mpsbasics.core" />
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="4lJSf3LkibK" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2G$12M" id="2MrvZqtDw3j" role="3989C9">
       <property role="TrG5h" value="com.mpsbasics.testutils" />
@@ -3091,6 +3162,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiA0" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiA1" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="1k6eCQnEVCy" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -3171,6 +3247,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiAd" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiAe" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="3fV34643ilv" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -3285,6 +3366,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="7Dx7sHRABiC" role="3bR37C">
+          <node concept="3bR9La" id="7Dx7sHRABiD" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="3fV34643kGS" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -3422,6 +3508,29 @@
           </node>
         </node>
       </node>
+      <node concept="3LEwk6" id="4lJSf3Lh3in" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="fasten.symo.plantuml" />
+        <property role="3LESm3" value="114acb95-50b2-4e9b-81c6-e0c665740eae" />
+        <node concept="398BVA" id="4lJSf3Lh3w0" role="3LF7KH">
+          <ref role="398BVh" node="1k6eCQnEQWe" resolve="fasten.symo.code" />
+          <node concept="2Ry0Ak" id="4lJSf3Lh48N" role="iGT6I">
+            <property role="2Ry0Am" value="devkits" />
+            <node concept="2Ry0Ak" id="4lJSf3Lh4$0" role="2Ry0An">
+              <property role="2Ry0Am" value="fasten.symo.plantuml" />
+              <node concept="2Ry0Ak" id="4lJSf3Lh4Zd" role="2Ry0An">
+                <property role="2Ry0Am" value="fasten.symo.plantuml.devkit" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3LEDTy" id="4lJSf3Lh5qZ" role="3LEDUa">
+          <ref role="3LEDTV" node="3fV34643ilv" resolve="com.symo.plantuml" />
+        </node>
+        <node concept="3LEDTM" id="4lJSf3Lh5r0" role="3LEDUa">
+          <ref role="3LEDTN" node="3fV34643kGS" resolve="com.symo.plantuml.lib" />
+        </node>
+      </node>
     </node>
     <node concept="2G$12M" id="7he_lUumCVe" role="3989C9">
       <property role="TrG5h" value="com.mbeddr.formal.req" />
@@ -3749,6 +3858,11 @@
             <ref role="1Busuk" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiC7" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiC8" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="4clv$caDtVU" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -3847,6 +3961,11 @@
             <ref role="3bR37D" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiCx" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiCy" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="7Jm8RM1zoDc" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -4070,6 +4189,11 @@
             <ref role="1Busuk" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiD4" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiD5" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="23wuL6uHOW4" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -4844,6 +4968,11 @@
             <ref role="3bR37D" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiFk" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiFl" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="7he_lUuvcDY" role="3989C9">
@@ -5114,6 +5243,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiFT" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiFU" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="7he_lUuoZ0r" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -5287,6 +5421,11 @@
             <ref role="3bR37D" to="90a9:PE3B26QCrP" resolve="org.apache.commons" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiG6" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiG7" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="7he_lUuoYjo" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -5608,6 +5747,11 @@
             <ref role="3bR37D" to="90a9:PE3B26QCrP" resolve="org.apache.commons" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiGS" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiGT" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="7he_lUup0GQ" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -5791,6 +5935,11 @@
             <ref role="3bR37D" node="1k6eCQnoUdo" resolve="com.mbeddr.formal.prism" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiHt" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiHu" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="1k6eCQnp0L6" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -5969,6 +6118,11 @@
             <ref role="3bR37D" node="1k6eCQnp8Cy" resolve="com.mbeddr.formal.smtlib.z3.lib" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiHP" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiHQ" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="1k6eCQnp8BN" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -6576,6 +6730,11 @@
             <ref role="3bR37D" node="2u7UHDCnPLY" resolve="com.mpsbasics.project.utils" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiIX" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiIY" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="42jqVeFkUub" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -6729,6 +6888,11 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiJl" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiJm" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="5yQpAUIgMcT" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -6829,6 +6993,11 @@
             <ref role="3bR37D" to="90a9:6wEeo$QJAsB" resolve="de.itemis.mps.editor.diagram.shapes" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiJy" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiJz" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="zCArZwUlNi" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -6934,6 +7103,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiJJ" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiJK" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="2Btqz_w6mDq" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -7048,6 +7222,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiK9" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiKa" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="2Btqz_w6o5R" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -7331,6 +7510,11 @@
             <ref role="3bR37D" to="90a9:6SVXTgIejl1" resolve="de.itemis.mps.editor.celllayout.runtime" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiL6" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiL7" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="6adXBxxUwrY" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -7844,6 +8028,11 @@
             <ref role="1Busuk" node="42jqVeFkUuV" resolve="com.mbeddr.formal.base" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiMp" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiMq" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="42jqVeFkUv2" role="3989C9">
@@ -7984,6 +8173,11 @@
             <ref role="3bR37D" to="90a9:6SVXTgIejl1" resolve="de.itemis.mps.editor.celllayout.runtime" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiMA" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiMB" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="6glUKoNR9Tl" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -8062,6 +8256,11 @@
             <ref role="3bR37D" node="42jqVeFkUuV" resolve="com.mbeddr.formal.base" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiN0" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiN1" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="1gJVC85JQA9" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -8624,6 +8823,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiOl" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiOm" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="4Hts7PYH8Di" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -8933,6 +9137,11 @@
             <ref role="3bR37D" to="90a9:6wEeo$QJAsB" resolve="de.itemis.mps.editor.diagram.shapes" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiP7" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiP8" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="6Kf5KB6_1El" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -9145,6 +9354,11 @@
             <ref role="3bR37D" to="al5i:2bBLuwR9$cn" resolve="com.mbeddr.mpsutil.interpreter.rt" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiPT" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiPU" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="6adXBxxUu$i" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -10156,6 +10370,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiSK" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiSL" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="6jOk53ehyXK" role="3989C9">
@@ -10501,6 +10720,11 @@
             <ref role="3bR37D" node="2u7UHDCnRuK" resolve="com.mpsbasics.editor.utils" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiTu" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiTv" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="5uFV_KLFgnB" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -10606,6 +10830,11 @@
             <ref role="3bR37D" node="2u7UHDCnRuK" resolve="com.mpsbasics.editor.utils" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiTF" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiTG" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="7he_lUurzLh" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -10734,6 +10963,11 @@
             <ref role="1Busuk" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiTS" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiTT" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="7he_lUur$v6" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -11071,6 +11305,11 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiUC" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiUD" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="4eD_5l3ft1H" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -11159,6 +11398,11 @@
             <ref role="1Busuk" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiUP" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiUQ" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="7he_lUuxic9" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -11839,6 +12083,11 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6LfQ" resolve="jetbrains.mps.kernel" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiWh" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiWi" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="5YWtEMPJWqd" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -11934,6 +12183,11 @@
             <ref role="3bR37D" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiWu" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiWv" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="y1G8y6aUhJ" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -12074,6 +12328,11 @@
             <ref role="1E1Vl2" to="ffeo:7Kfy9QB6L9O" resolve="jetbrains.mps.lang.smodel" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiWF" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiWG" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="6VBHnHRiYOJ" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -12353,6 +12612,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiXC" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiXD" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="3h2IzuaJeCO" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -12444,6 +12708,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiXP" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiXQ" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="4y8PK54$RUo" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -12651,6 +12920,11 @@
             <ref role="1Busuk" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiYq" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiYr" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="7he_lUurCAX" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -12729,6 +13003,11 @@
             <ref role="3bR37D" to="ffeo:3HV74$ebibC" resolve="jetbrains.mps.lang.text" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiYB" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiYC" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="7he_lUurDmQ" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -12832,6 +13111,11 @@
             <ref role="3bR37D" node="2u7UHDCnRuK" resolve="com.mpsbasics.editor.utils" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiYO" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiYP" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="5uFV_KLFfhe" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -13050,6 +13334,11 @@
             <ref role="3bR37D" node="2u7UHDCnRuK" resolve="com.mpsbasics.editor.utils" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiZc" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiZd" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="3R_yAtWp53E" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -13222,6 +13511,11 @@
             <ref role="3bR37D" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3LkiZL" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3LkiZM" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="73rWdFZqBpF" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -13380,6 +13674,11 @@
             <ref role="3bR37D" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3Lkj09" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3Lkj0a" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="4eD_5l3aAE2" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -13643,6 +13942,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3Lkj0G" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3Lkj0H" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="3DZJpXNn_S4" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -14548,6 +14852,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3Lie7a" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3Lie7b" role="1SiIV1">
+            <ref role="3bR37D" node="3fV34643ilv" resolve="com.symo.plantuml" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="4ziKDEngAys" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -14752,6 +15061,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3Lkj2M" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3Lkj2N" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="6Z2HiVHt7eY" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -14822,6 +15136,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3Lkj2Z" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3Lkj30" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="6Z2HiVHtdiP" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -15018,6 +15337,11 @@
             <ref role="3bR37D" node="6Z2HiVHtdiP" resolve="com.mbeddr.formal.safety.argument.runtime.pluginSolution" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3Lkj3n" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3Lkj3o" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="6i5G5_YU7r7" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -15103,6 +15427,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="4lJSf3Lkj3$" role="3bR37C">
+          <node concept="3bR9La" id="4lJSf3Lkj3_" role="1SiIV1">
+            <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
+          </node>
+        </node>
       </node>
       <node concept="1X3_iC" id="1FMyjUPhLkE" role="lGtFl">
         <property role="3V$3am" value="modules" />
diff --git a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/com.mbeddr.formal.smtlib.synthesis.mpl b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/com.mbeddr.formal.smtlib.synthesis.mpl
index 5b4ce6486..14c1ecb0b 100644
--- a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/com.mbeddr.formal.smtlib.synthesis.mpl
+++ b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/com.mbeddr.formal.smtlib.synthesis.mpl
@@ -86,6 +86,7 @@
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
diff --git a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/com.mbeddr.formal.smtlib.mpl b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/com.mbeddr.formal.smtlib.mpl
index 373b0689e..82caa63e9 100644
--- a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/com.mbeddr.formal.smtlib.mpl
+++ b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/com.mbeddr.formal.smtlib.mpl
@@ -17,6 +17,7 @@
     <dependency reexport="false">03458680-b827-4dcd-a8ca-ad82e7bdf60e(com.mbeddr.formal.smtlib.z3.rt)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">f7821750-33bf-489c-8f64-0850d86d540d(com.mbeddr.formal.smtlib.z3.lib)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="2" />
@@ -74,6 +75,7 @@
     <module reference="9e54e509-552a-4f20-9b96-12a273367cff(com.mbeddr.formal.smtlib)" version="0" />
     <module reference="f7821750-33bf-489c-8f64-0850d86d540d(com.mbeddr.formal.smtlib.z3.lib)" version="0" />
     <module reference="03458680-b827-4dcd-a8ca-ad82e7bdf60e(com.mbeddr.formal.smtlib.z3.rt)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/models/editor.mps b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/models/editor.mps
index a98c31291..93de97d07 100644
--- a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/models/editor.mps
@@ -13,6 +13,7 @@
     <import index="3fe0" ref="r:848c2b01-cc1a-44aa-b277-5acd56d63ece(com.mbeddr.formal.base.expressions.editor)" />
     <import index="d9cz" ref="r:41c1238c-43f1-4441-984e-72955eefcbfb(com.mbeddr.formal.smtlib.structure)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="ehqg" ref="r:2c1724e1-8ed6-4fe4-9e44-fae13cd2a5ac(com.mbeddr.formal.base.expressions.structure)" implicit="true" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
@@ -210,7 +211,7 @@
           <property role="VOm3f" value="false" />
         </node>
         <node concept="PMmxH" id="4xJapKM67gV" role="3EZMnx">
-          <ref role="PMmxG" to="xnej:4xJapKM66o$" resolve="iconAndNameCell" />
+          <ref role="PMmxG" to="1ks0:4xJapKM66o$" resolve="iconAndNameCell" />
         </node>
         <node concept="l2Vlx" id="6NmtaR1SUJQ" role="2iSdaV" />
       </node>
@@ -219,13 +220,13 @@
         <node concept="l2Vlx" id="3r83Ks0gb4d" role="2iSdaV" />
         <node concept="3F0ifn" id="3r83Ks0gb4e" role="3EZMnx">
           <property role="3F0ifm" value="model  " />
-          <ref role="1k5W1q" to="xnej:2CEi94e3iKI" resolve="PassiveTextStyle" />
+          <ref role="1k5W1q" to="1ks0:2CEi94e3iKI" resolve="PassiveTextStyle" />
           <node concept="VPM3Z" id="3r83Ks0gyrX" role="3F10Kt">
             <property role="VOm3f" value="false" />
           </node>
         </node>
         <node concept="1HlG4h" id="3r83Ks0gb4f" role="3EZMnx">
-          <ref role="1k5W1q" to="xnej:2CEi94e3iKI" resolve="PassiveTextStyle" />
+          <ref role="1k5W1q" to="1ks0:2CEi94e3iKI" resolve="PassiveTextStyle" />
           <node concept="1HfYo3" id="3r83Ks0gb4g" role="1HlULh">
             <node concept="3TQlhw" id="3r83Ks0gb4h" role="1Hhtcw">
               <node concept="3clFbS" id="3r83Ks0gb4i" role="2VODD2">
@@ -265,13 +266,13 @@
         <node concept="l2Vlx" id="3r83Ks0g7Sl" role="2iSdaV" />
         <node concept="3F0ifn" id="3r83Ks0gb4b" role="3EZMnx">
           <property role="3F0ifm" value="package" />
-          <ref role="1k5W1q" to="xnej:2CEi94e3iKI" resolve="PassiveTextStyle" />
+          <ref role="1k5W1q" to="1ks0:2CEi94e3iKI" resolve="PassiveTextStyle" />
           <node concept="VPM3Z" id="3r83Ks0gyrW" role="3F10Kt">
             <property role="VOm3f" value="false" />
           </node>
         </node>
         <node concept="1HlG4h" id="6GZLGDRsw6C" role="3EZMnx">
-          <ref role="1k5W1q" to="xnej:2CEi94e3iKI" resolve="PassiveTextStyle" />
+          <ref role="1k5W1q" to="1ks0:2CEi94e3iKI" resolve="PassiveTextStyle" />
           <node concept="1HfYo3" id="6GZLGDRsw6D" role="1HlULh">
             <node concept="3TQlhw" id="6GZLGDRsw6E" role="1Hhtcw">
               <node concept="3clFbS" id="6GZLGDRsw6F" role="2VODD2">
@@ -325,7 +326,7 @@
       </node>
       <node concept="3F0ifn" id="6NmtaR1SUKE" role="3EZMnx" />
       <node concept="PMmxH" id="4_pH3zvdAeV" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4_pH3zvd_oC" resolve="horizontalLine" />
+        <ref role="PMmxG" to="1ks0:4_pH3zvd_oC" resolve="horizontalLine" />
       </node>
       <node concept="3F0ifn" id="14CuINs4Qgl" role="3EZMnx" />
       <node concept="3F2HdR" id="6NmtaR1TTPF" role="3EZMnx">
diff --git a/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/com.mbeddr.formal.smtlib.z3.rt.msd b/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/com.mbeddr.formal.smtlib.z3.rt.msd
index cbf15f65b..ea98bcd39 100644
--- a/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/com.mbeddr.formal.smtlib.z3.rt.msd
+++ b/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/com.mbeddr.formal.smtlib.z3.rt.msd
@@ -25,6 +25,7 @@
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:c0080a47-7e37-4558-bee9-9ae18e690549:jetbrains.mps.lang.extension" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/com.mbeddr.formal.spin.c.core.mpl b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/com.mbeddr.formal.spin.c.core.mpl
index 8fb5de756..b14a2f9f2 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/com.mbeddr.formal.spin.c.core.mpl
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/com.mbeddr.formal.spin.c.core.mpl
@@ -18,6 +18,7 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
     <dependency reexport="false">ef89f137-f966-4966-a202-ab9ea26e79fe(com.mbeddr.formal.spin.c.core)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="2" />
@@ -77,6 +78,7 @@
     <module reference="ad8d48af-022b-40dc-8979-2b76074fb438(com.mbeddr.formal.spin)" version="0" />
     <module reference="ef89f137-f966-4966-a202-ab9ea26e79fe(com.mbeddr.formal.spin.c.core)" version="0" />
     <module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/models/editor.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/models/editor.mps
index a7adde8a0..682f15ed8 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/models/editor.mps
@@ -13,6 +13,7 @@
     <import index="vshk" ref="r:dc20c736-549c-48b4-b95d-eb5e0a95f624(com.mbeddr.formal.spin.c.core.structure)" />
     <import index="o3hv" ref="r:b3500a5a-8007-441a-b8a4-ba1b48ead2e8(com.mbeddr.formal.spin.structure)" />
     <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="ehqg" ref="r:2c1724e1-8ed6-4fe4-9e44-fae13cd2a5ac(com.mbeddr.formal.base.expressions.structure)" implicit="true" />
@@ -217,7 +218,7 @@
     <ref role="1XX52x" to="vshk:1ZejHLlNdmO" resolve="TypeBase" />
     <node concept="PMmxH" id="1ZejHLlNdn9" role="2wV5jI">
       <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-      <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+      <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
     </node>
   </node>
   <node concept="24kQdi" id="1ZejHLlNdsN">
@@ -282,7 +283,7 @@
       <node concept="2iRkQZ" id="1ZejHLlNd$A" role="2iSdaV" />
       <node concept="3F0ifn" id="4_pH3zvfIjP" role="3EZMnx" />
       <node concept="PMmxH" id="4_pH3zvfIjW" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4_pH3zvd_oC" resolve="horizontalLine" />
+        <ref role="PMmxG" to="1ks0:4_pH3zvd_oC" resolve="horizontalLine" />
       </node>
       <node concept="3F0ifn" id="1ZejHLlNd_b" role="3EZMnx" />
       <node concept="3F2HdR" id="1ZejHLlNd_B" role="3EZMnx">
@@ -305,7 +306,7 @@
       </node>
       <node concept="3F0ifn" id="26dfgZlUyl3" role="3EZMnx" />
       <node concept="PMmxH" id="26dfgZlUymh" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4_pH3zvd_oC" resolve="horizontalLine" />
+        <ref role="PMmxG" to="1ks0:4_pH3zvd_oC" resolve="horizontalLine" />
       </node>
       <node concept="3F0ifn" id="26dfgZlUymS" role="3EZMnx" />
       <node concept="3EZMnI" id="26dfgZlUyph" role="3EZMnx">
@@ -418,7 +419,7 @@
       <node concept="3EZMnI" id="1ZejHLlNBRq" role="1LiK7o">
         <node concept="1kHk_G" id="1vcsY83xQoo" role="3EZMnx">
           <ref role="1NtTu8" to="vshk:1vcsY83xQnZ" resolve="extern" />
-          <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+          <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
         </node>
         <node concept="1kIj98" id="1ZejHLlNBRC" role="3EZMnx">
           <node concept="3F1sOY" id="1ZejHLlNBRK" role="1kIj9b">
@@ -465,7 +466,7 @@
     <node concept="3EZMnI" id="1ZejHLlS04c" role="2wV5jI">
       <node concept="3F0ifn" id="1ZejHLlS04p" role="3EZMnx">
         <property role="3F0ifm" value="#include" />
-        <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+        <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
       </node>
       <node concept="3F0A7n" id="1ZejHLlS04_" role="3EZMnx">
         <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
@@ -525,7 +526,7 @@
     <node concept="3EZMnI" id="5mKzygM2UA$" role="2wV5jI">
       <node concept="3F0ifn" id="5mKzygM2UAI" role="3EZMnx">
         <property role="3F0ifm" value="#define" />
-        <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+        <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
       </node>
       <node concept="3F0A7n" id="5mKzygM2UAR" role="3EZMnx">
         <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
@@ -658,7 +659,7 @@
     <node concept="3EZMnI" id="2yuIwRzd_Oc" role="2wV5jI">
       <node concept="3F0ifn" id="2yuIwRzd_Om" role="3EZMnx">
         <property role="3F0ifm" value="for" />
-        <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+        <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
       </node>
       <node concept="3F0ifn" id="2yuIwRzd_Ov" role="3EZMnx">
         <property role="3F0ifm" value="(" />
@@ -896,7 +897,7 @@
     <node concept="3EZMnI" id="3OkkWixrFX3" role="2wV5jI">
       <node concept="3F0ifn" id="3OkkWixrFXd" role="3EZMnx">
         <property role="3F0ifm" value="sizeof" />
-        <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+        <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
       </node>
       <node concept="3F0ifn" id="3OkkWixrFXm" role="3EZMnx">
         <property role="3F0ifm" value="(" />
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/com.mbeddr.formal.spin.hdl.mpl b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/com.mbeddr.formal.spin.hdl.mpl
index 75ce0e8ca..0a8a27d02 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/com.mbeddr.formal.spin.hdl.mpl
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/com.mbeddr.formal.spin.hdl.mpl
@@ -152,6 +152,7 @@
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
     <dependency reexport="false">628c1bba-6b54-4c71-927c-3cff044349e4(com.mbeddr.formal.spin.hdl)</dependency>
     <dependency reexport="false">ef89f137-f966-4966-a202-ab9ea26e79fe(com.mbeddr.formal.spin.c.core)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
@@ -223,6 +224,7 @@
     <module reference="bd54ef69-17ec-411b-8f49-485702e74565(com.mbeddr.formal.spin.ext)" version="0" />
     <module reference="628c1bba-6b54-4c71-927c-3cff044349e4(com.mbeddr.formal.spin.hdl)" version="0" />
     <module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/editor.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/editor.mps
index 1e0cf9760..9601bbd5a 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/editor.mps
@@ -15,6 +15,7 @@
     <import index="y6ji" ref="r:8ddb424f-ead9-4d6e-9e90-7a7d026ff9c2(com.mbeddr.formal.spin.hdl.structure)" />
     <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
     <import index="3fe0" ref="r:848c2b01-cc1a-44aa-b277-5acd56d63ece(com.mbeddr.formal.base.expressions.editor)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
@@ -195,7 +196,7 @@
         </node>
         <node concept="3F0ifn" id="1ZejHLlNgvW" role="3EZMnx">
           <property role="3F0ifm" value="decl" />
-          <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+          <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
         </node>
         <node concept="3F0ifn" id="1ZejHLlNgw5" role="3EZMnx">
           <property role="3F0ifm" value="{" />
@@ -247,7 +248,7 @@
       <node concept="3EZMnI" id="4Hts7PYnn54" role="3EZMnx">
         <node concept="l2Vlx" id="4Hts7PYnn55" role="2iSdaV" />
         <node concept="PMmxH" id="4_pH3zvduDi" role="3EZMnx">
-          <ref role="PMmxG" to="xnej:4xJapKM66o$" resolve="iconAndNameCell" />
+          <ref role="PMmxG" to="1ks0:4xJapKM66o$" resolve="iconAndNameCell" />
         </node>
         <node concept="3XFhqQ" id="4Hts7PYnnaf" role="3EZMnx" />
         <node concept="3XFhqQ" id="4Hts7PYnnax" role="3EZMnx" />
@@ -292,7 +293,7 @@
       </node>
       <node concept="3F0ifn" id="4_pH3zvfIjP" role="3EZMnx" />
       <node concept="PMmxH" id="4_pH3zvfIjW" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4_pH3zvd_oC" resolve="horizontalLine" />
+        <ref role="PMmxG" to="1ks0:4_pH3zvd_oC" resolve="horizontalLine" />
       </node>
       <node concept="3F0ifn" id="1ZejHLlNi1T" role="3EZMnx" />
       <node concept="2iRkQZ" id="1ZejHLlNhXz" role="2iSdaV" />
@@ -323,7 +324,7 @@
         </node>
         <node concept="3F0ifn" id="1ZejHLlNYZs" role="3EZMnx">
           <property role="3F0ifm" value="harness" />
-          <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+          <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
         </node>
         <node concept="3F0A7n" id="1ZejHLlNYZF" role="3EZMnx">
           <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
@@ -387,7 +388,7 @@
     <node concept="3EZMnI" id="1ZejHLlO7$p" role="2wV5jI">
       <node concept="PMmxH" id="5SGsxw7Awg9" role="3EZMnx">
         <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-        <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+        <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
       </node>
       <node concept="3F0ifn" id="1ZejHLlO7$G" role="3EZMnx">
         <property role="3F0ifm" value="(" />
@@ -498,7 +499,7 @@
     <node concept="3EZMnI" id="2DjQaub$5wj" role="2wV5jI">
       <node concept="3F0ifn" id="2DjQaub$5wt" role="3EZMnx">
         <property role="3F0ifm" value="assert" />
-        <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+        <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
       </node>
       <node concept="3F0ifn" id="2DjQaub$5wA" role="3EZMnx">
         <property role="3F0ifm" value="(" />
@@ -661,7 +662,7 @@
     <node concept="3EZMnI" id="5SGsxw7BACX" role="2wV5jI">
       <node concept="PMmxH" id="5SGsxw7BACY" role="3EZMnx">
         <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-        <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+        <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
       </node>
       <node concept="3F0ifn" id="5SGsxw7BACZ" role="3EZMnx">
         <property role="3F0ifm" value="(" />
@@ -731,7 +732,7 @@
       <node concept="3EZMnI" id="5SGsxw7L3_t" role="3EZMnx">
         <node concept="3F0ifn" id="5SGsxw7L3_B" role="3EZMnx">
           <property role="3F0ifm" value="choice" />
-          <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+          <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
         </node>
         <node concept="1HlG4h" id="5SGsxw7L3_K" role="3EZMnx">
           <node concept="1HfYo3" id="5SGsxw7L3_M" role="1HlULh">
@@ -755,7 +756,7 @@
           <node concept="3EZMnI" id="5SGsxw7L6Gg" role="_tjki">
             <node concept="3F0ifn" id="5SGsxw7L6Gi" role="3EZMnx">
               <property role="3F0ifm" value="if" />
-              <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+              <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
             </node>
             <node concept="3F1sOY" id="5SGsxw7L6Gy" role="3EZMnx">
               <ref role="1NtTu8" to="y6ji:5SGsxw7L3_o" resolve="guard" />
@@ -799,7 +800,7 @@
         <node concept="VPM3Z" id="5SGsxw7L81o" role="3F10Kt" />
         <node concept="3F0ifn" id="5SGsxw7L81_" role="3EZMnx">
           <property role="3F0ifm" value="nondet_choice" />
-          <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+          <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
         </node>
         <node concept="3F0ifn" id="5SGsxw7L81I" role="3EZMnx">
           <property role="3F0ifm" value="{" />
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/com.mbeddr.formal.spin.mpl b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/com.mbeddr.formal.spin.mpl
index a7a4b0d61..52b2307e6 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/com.mbeddr.formal.spin.mpl
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/com.mbeddr.formal.spin.mpl
@@ -81,6 +81,7 @@
     <dependency reexport="true">d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)</dependency>
     <dependency reexport="false">ad8d48af-022b-40dc-8979-2b76074fb438(com.mbeddr.formal.spin)</dependency>
     <dependency reexport="false">39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)</dependency>
+    <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
@@ -151,6 +152,7 @@
     <module reference="9ce94094-51d9-4013-bdfc-e4db03298f9f(com.mbeddr.formal.spin.pluginSolution)" version="0" />
     <module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
     <module reference="6c88fcd1-5552-4d29-9f1b-f00bd84dd40e(com.mbeddr.mpsutil.genreview)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/editor.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/editor.mps
index 13cf5b857..2ea03373d 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/editor.mps
@@ -12,6 +12,7 @@
   <imports>
     <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
     <import index="o3hv" ref="r:b3500a5a-8007-441a-b8a4-ba1b48ead2e8(com.mbeddr.formal.spin.structure)" />
+    <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="ehqg" ref="r:2c1724e1-8ed6-4fe4-9e44-fae13cd2a5ac(com.mbeddr.formal.base.expressions.structure)" implicit="true" />
     <import index="ox2v" ref="r:9d0d3f45-3600-4f52-892b-d59f24c624ff(com.mbeddr.formal.base.expressions.behavior)" implicit="true" />
@@ -222,7 +223,7 @@
       <node concept="3EZMnI" id="4Hts7PYnn54" role="3EZMnx">
         <node concept="l2Vlx" id="4Hts7PYnn55" role="2iSdaV" />
         <node concept="PMmxH" id="4_pH3zvduDi" role="3EZMnx">
-          <ref role="PMmxG" to="xnej:4xJapKM66o$" resolve="iconAndNameCell" />
+          <ref role="PMmxG" to="1ks0:4xJapKM66o$" resolve="iconAndNameCell" />
         </node>
         <node concept="3XFhqQ" id="4Hts7PYnnaf" role="3EZMnx" />
         <node concept="3XFhqQ" id="4Hts7PYnnax" role="3EZMnx" />
@@ -248,7 +249,7 @@
       </node>
       <node concept="3F0ifn" id="4_pH3zvfIjP" role="3EZMnx" />
       <node concept="PMmxH" id="4_pH3zvfIjW" role="3EZMnx">
-        <ref role="PMmxG" to="xnej:4_pH3zvd_oC" resolve="horizontalLine" />
+        <ref role="PMmxG" to="1ks0:4_pH3zvd_oC" resolve="horizontalLine" />
       </node>
       <node concept="3F0ifn" id="4_pH3zvfIk0" role="3EZMnx" />
       <node concept="3F2HdR" id="4_pH3zvfIkb" role="3EZMnx">
@@ -367,7 +368,7 @@
         </node>
         <node concept="1kHk_G" id="4_pH3zvfOdo" role="3EZMnx">
           <ref role="1NtTu8" to="o3hv:4_pH3zvfNZo" resolve="active" />
-          <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+          <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
         </node>
         <node concept="_tjkj" id="4_pH3zvfOdy" role="3EZMnx">
           <node concept="3EZMnI" id="407WgdX9fv9" role="_tjki">
@@ -391,7 +392,7 @@
         </node>
         <node concept="3F0ifn" id="4_pH3zvfOdO" role="3EZMnx">
           <property role="3F0ifm" value="proctype" />
-          <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+          <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
         </node>
         <node concept="3F0A7n" id="4_pH3zvfOec" role="3EZMnx">
           <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
@@ -632,7 +633,7 @@
     <node concept="3EZMnI" id="2DjQaub$5wj" role="2wV5jI">
       <node concept="3F0ifn" id="2DjQaub$5wt" role="3EZMnx">
         <property role="3F0ifm" value="assert" />
-        <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+        <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
       </node>
       <node concept="3F0ifn" id="2DjQaub$5wA" role="3EZMnx">
         <property role="3F0ifm" value="(" />
@@ -854,7 +855,7 @@
       </node>
       <node concept="3F0ifn" id="2DjQaubD44p" role="3EZMnx">
         <property role="3F0ifm" value="break" />
-        <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+        <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
       </node>
       <node concept="l2Vlx" id="2DjQaubD449" role="2iSdaV" />
     </node>
@@ -868,7 +869,7 @@
       </node>
       <node concept="3F0ifn" id="2DjQaubD47X" role="3EZMnx">
         <property role="3F0ifm" value="else" />
-        <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+        <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
       </node>
       <node concept="3F0ifn" id="2DjQaubD48l" role="3EZMnx">
         <property role="3F0ifm" value="-&gt;" />
@@ -885,7 +886,7 @@
     <node concept="3EZMnI" id="2DjQaubEBx9" role="2wV5jI">
       <node concept="3F0ifn" id="2DjQaubEBxj" role="3EZMnx">
         <property role="3F0ifm" value="do" />
-        <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+        <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
       </node>
       <node concept="3EZMnI" id="2DjQaubEBxs" role="3EZMnx">
         <node concept="VPM3Z" id="2DjQaubEBxu" role="3F10Kt">
@@ -904,7 +905,7 @@
       <node concept="2iRkQZ" id="2DjQaubEBxc" role="2iSdaV" />
       <node concept="3F0ifn" id="2DjQaubEBy8" role="3EZMnx">
         <property role="3F0ifm" value="od;" />
-        <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+        <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
       </node>
     </node>
   </node>
@@ -914,7 +915,7 @@
     <node concept="3EZMnI" id="2DjQaubFlqy" role="2wV5jI">
       <node concept="3F0ifn" id="2DjQaubFlqG" role="3EZMnx">
         <property role="3F0ifm" value="if" />
-        <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+        <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
       </node>
       <node concept="3EZMnI" id="2DjQaubFlqP" role="3EZMnx">
         <node concept="VPM3Z" id="2DjQaubFlqR" role="3F10Kt">
@@ -933,7 +934,7 @@
       <node concept="2iRkQZ" id="2DjQaubFlq_" role="2iSdaV" />
       <node concept="3F0ifn" id="2DjQaubFlrv" role="3EZMnx">
         <property role="3F0ifm" value="fi;" />
-        <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+        <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
       </node>
     </node>
   </node>
@@ -978,7 +979,7 @@
     <node concept="3EZMnI" id="407WgdX3YF$" role="2wV5jI">
       <node concept="3F0ifn" id="407WgdX3YFF" role="3EZMnx">
         <property role="3F0ifm" value="goto" />
-        <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+        <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
       </node>
       <node concept="1iCGBv" id="407WgdX3YFL" role="3EZMnx">
         <ref role="1NtTu8" to="o3hv:407WgdX3YAf" resolve="label" />
@@ -1055,7 +1056,7 @@
     <node concept="3EZMnI" id="407WgdXeD_X" role="2wV5jI">
       <node concept="3F0ifn" id="407WgdXeDA7" role="3EZMnx">
         <property role="3F0ifm" value="atomic" />
-        <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+        <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
       </node>
       <node concept="3F1sOY" id="407WgdXeDAg" role="3EZMnx">
         <ref role="1NtTu8" to="o3hv:407WgdXeD_g" resolve="stmts" />
@@ -1069,7 +1070,7 @@
     <node concept="3EZMnI" id="407WgdXfxhD" role="2wV5jI">
       <node concept="3F0ifn" id="407WgdXfxhN" role="3EZMnx">
         <property role="3F0ifm" value="run" />
-        <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+        <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
       </node>
       <node concept="1iCGBv" id="407WgdXfxhW" role="3EZMnx">
         <ref role="1NtTu8" to="o3hv:407WgdXfxhm" resolve="proc" />
@@ -1108,7 +1109,7 @@
     <ref role="1XX52x" to="o3hv:4Hts7PYbbeh" resolve="NrPr" />
     <node concept="3F0ifn" id="4Hts7PYbbeq" role="2wV5jI">
       <property role="3F0ifm" value="_nr_pr" />
-      <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+      <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
     </node>
   </node>
   <node concept="24kQdi" id="4Hts7PYcJYx">
@@ -1187,7 +1188,7 @@
     <node concept="3EZMnI" id="4Hts7PYAJU5" role="2wV5jI">
       <node concept="3F0ifn" id="4Hts7PYAJU6" role="3EZMnx">
         <property role="3F0ifm" value="d_step" />
-        <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+        <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
       </node>
       <node concept="3F1sOY" id="4Hts7PYAJU7" role="3EZMnx">
         <ref role="1NtTu8" to="o3hv:4Hts7PYAJTw" resolve="stmts" />
@@ -1201,7 +1202,7 @@
     <node concept="3EZMnI" id="5y2MdLwTJQ_" role="2wV5jI">
       <node concept="3F0ifn" id="5y2MdLwTJQJ" role="3EZMnx">
         <property role="3F0ifm" value="c_code" />
-        <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+        <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
       </node>
       <node concept="3F1sOY" id="5y2MdLwTJQS" role="3EZMnx">
         <ref role="1NtTu8" to="o3hv:5y2MdLwTJQj" resolve="body" />
@@ -1214,7 +1215,7 @@
     <ref role="1XX52x" to="o3hv:1ZejHLlJMGA" resolve="SkipStatement" />
     <node concept="3F0ifn" id="1ZejHLlJMHg" role="2wV5jI">
       <property role="3F0ifm" value="skip;" />
-      <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+      <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
     </node>
   </node>
   <node concept="24kQdi" id="1ZejHLlKNJo">
@@ -1241,7 +1242,7 @@
     <node concept="3EZMnI" id="1ZejHLlOkyE" role="2wV5jI">
       <node concept="3F0ifn" id="1ZejHLlOkyR" role="3EZMnx">
         <property role="3F0ifm" value="select" />
-        <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+        <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
       </node>
       <node concept="3F0ifn" id="1ZejHLlOkz3" role="3EZMnx">
         <property role="3F0ifm" value="(" />
@@ -1348,7 +1349,7 @@
         </node>
         <node concept="3F0ifn" id="1ZejHLlQMYJ" role="3EZMnx">
           <property role="3F0ifm" value="c_decl" />
-          <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+          <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
         </node>
         <node concept="3F0ifn" id="1ZejHLlQMYV" role="3EZMnx">
           <property role="3F0ifm" value="{" />
@@ -1636,7 +1637,7 @@
         </node>
         <node concept="3F0ifn" id="3_qrK00j4t$" role="3EZMnx">
           <property role="3F0ifm" value="(" />
-          <ref role="1k5W1q" to="xnej:2CEi94dh36z" resolve="ParensStyle" />
+          <ref role="1k5W1q" to="1ks0:2CEi94dh36z" resolve="ParensStyle" />
           <node concept="pkWqt" id="3_qrK00j4t_" role="pqm2j">
             <node concept="3clFbS" id="3_qrK00j4tA" role="2VODD2">
               <node concept="3clFbF" id="3_qrK00j4tB" role="3cqZAp">
@@ -1700,7 +1701,7 @@
         </node>
         <node concept="3F0ifn" id="3_qrK00jd$Z" role="3EZMnx">
           <property role="3F0ifm" value=")" />
-          <ref role="1k5W1q" to="xnej:2CEi94dh36z" resolve="ParensStyle" />
+          <ref role="1k5W1q" to="1ks0:2CEi94dh36z" resolve="ParensStyle" />
           <node concept="pkWqt" id="3_qrK00jd_0" role="pqm2j">
             <node concept="3clFbS" id="3_qrK00jd_1" role="2VODD2">
               <node concept="3clFbF" id="3_qrK00jd_2" role="3cqZAp">
@@ -1741,7 +1742,7 @@
         </node>
         <node concept="3F0ifn" id="3_qrK00jd_d" role="3EZMnx">
           <property role="3F0ifm" value="(" />
-          <ref role="1k5W1q" to="xnej:2CEi94dh36z" resolve="ParensStyle" />
+          <ref role="1k5W1q" to="1ks0:2CEi94dh36z" resolve="ParensStyle" />
           <node concept="11LMrY" id="3_qrK00jd_e" role="3F10Kt">
             <property role="VOm3f" value="true" />
           </node>
@@ -1822,7 +1823,7 @@
         </node>
         <node concept="3F0ifn" id="3_qrK00j4ux" role="3EZMnx">
           <property role="3F0ifm" value=")" />
-          <ref role="1k5W1q" to="xnej:2CEi94dh36z" resolve="ParensStyle" />
+          <ref role="1k5W1q" to="1ks0:2CEi94dh36z" resolve="ParensStyle" />
           <node concept="pkWqt" id="3_qrK00j4uy" role="pqm2j">
             <node concept="3clFbS" id="3_qrK00j4uz" role="2VODD2">
               <node concept="3clFbF" id="3_qrK00j4u$" role="3cqZAp">
@@ -1886,7 +1887,7 @@
     <node concept="3EZMnI" id="3xpT6K6zvMF" role="2wV5jI">
       <node concept="3F0ifn" id="3xpT6K6zvMG" role="3EZMnx">
         <property role="3F0ifm" value="assert" />
-        <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+        <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
       </node>
       <node concept="3F0ifn" id="3xpT6K6zvMH" role="3EZMnx">
         <property role="3F0ifm" value="(" />
@@ -2070,7 +2071,7 @@
         </node>
         <node concept="3F0ifn" id="3VQuWX0R_c" role="3EZMnx">
           <property role="3F0ifm" value="inline" />
-          <ref role="1k5W1q" to="xnej:6NmtaR1SVrw" resolve="KeywordStyle" />
+          <ref role="1k5W1q" to="1ks0:6NmtaR1SVrw" resolve="KeywordStyle" />
         </node>
         <node concept="3F0A7n" id="3VQuWX0R_d" role="3EZMnx">
           <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
diff --git a/code/languages/com.mpsbasics/.mps/modules.xml b/code/languages/com.mpsbasics/.mps/modules.xml
index 87dacf675..188be065e 100644
--- a/code/languages/com.mpsbasics/.mps/modules.xml
+++ b/code/languages/com.mpsbasics/.mps/modules.xml
@@ -2,6 +2,7 @@
 <project version="4">
   <component name="MPSProject">
     <projectModules>
+      <modulePath path="$PROJECT_DIR$/languages/com.mpsbasics.core/com.mpsbasics.core.mpl" folder="" />
       <modulePath path="$PROJECT_DIR$/languages/com.mpsbasics.jira/com.mpsbasics.jira.mpl" folder="jira" />
       <modulePath path="$PROJECT_DIR$/languages/com.mpsbasics.pdfexporter/com.mpsbasics.pdfexporter.mpl" folder="pdfbox" />
       <modulePath path="$PROJECT_DIR$/solutions/com.mpsbasics.build/com.mpsbasics.build.msd" folder="" />
diff --git a/code/languages/com.mpsbasics/languages/com.mpsbasics.core/com.mpsbasics.core.mpl b/code/languages/com.mpsbasics/languages/com.mpsbasics.core/com.mpsbasics.core.mpl
new file mode 100644
index 000000000..f0cf1d94a
--- /dev/null
+++ b/code/languages/com.mpsbasics/languages/com.mpsbasics.core/com.mpsbasics.core.mpl
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<language namespace="com.mpsbasics.core" uuid="792be022-0a7a-4b28-bfd8-b1b2d347b772" languageVersion="0" moduleVersion="0">
+  <models>
+    <modelRoot type="default" contentPath="${module}">
+      <sourceRoot location="models" />
+    </modelRoot>
+  </models>
+  <facets>
+    <facet compile="mps" classes="mps" ext="yes" type="java">
+      <classes generated="true" path="${module}/classes_gen" />
+    </facet>
+  </facets>
+  <accessoryModels />
+  <dependencies>
+    <dependency reexport="false">848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)</dependency>
+    <dependency reexport="false">8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)</dependency>
+  </dependencies>
+  <languageVersions>
+    <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" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
+    <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
+    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
+    <language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
+    <language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />
+    <language slang="l:5dae8159-ab99-46bb-a40d-0cee30ee7018:jetbrains.mps.lang.constraints.rules.kinds" version="0" />
+    <language slang="l:134c38d4-e3af-4d9e-b069-1c7df0a4005d:jetbrains.mps.lang.constraints.rules.skeleton" version="0" />
+    <language slang="l:3ad5badc-1d9c-461c-b7b1-fa2fcd0a0ae7:jetbrains.mps.lang.context" version="0" />
+    <language slang="l:ea3159bf-f48e-4720-bde2-86dba75f0d34:jetbrains.mps.lang.context.defs" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
+    <language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
+    <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
+    <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
+    <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
+    <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
+  </languageVersions>
+  <dependencyVersions>
+    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
+    <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
+    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
+    <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
+    <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
+    <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
+    <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
+    <module reference="fdaaf35f-8ee3-4c37-b09d-9efaeaaa7a41(jetbrains.mps.core.tool.environment)" version="0" />
+    <module reference="8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)" version="0" />
+    <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+    <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
+  </dependencyVersions>
+  <extendedLanguages />
+</language>
+
diff --git a/code/languages/com.mpsbasics/languages/com.mpsbasics.core/models/com.mpsbasics.core.behavior.mps b/code/languages/com.mpsbasics/languages/com.mpsbasics.core/models/com.mpsbasics.core.behavior.mps
new file mode 100644
index 000000000..30c95d15d
--- /dev/null
+++ b/code/languages/com.mpsbasics/languages/com.mpsbasics.core/models/com.mpsbasics.core.behavior.mps
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:2555324a-debd-4918-9a8f-d1dc14210cc6(com.mpsbasics.core.behavior)">
+  <persistence version="9" />
+  <languages>
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
+    <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
+    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+  </languages>
+  <imports />
+  <registry />
+</model>
+
diff --git a/code/languages/com.mpsbasics/languages/com.mpsbasics.core/models/com.mpsbasics.core.constraints.mps b/code/languages/com.mpsbasics/languages/com.mpsbasics.core/models/com.mpsbasics.core.constraints.mps
new file mode 100644
index 000000000..5da7c7685
--- /dev/null
+++ b/code/languages/com.mpsbasics/languages/com.mpsbasics.core/models/com.mpsbasics.core.constraints.mps
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:afa6e057-449f-44ed-a862-415ada62536a(com.mpsbasics.core.constraints)">
+  <persistence version="9" />
+  <languages>
+    <use id="5dae8159-ab99-46bb-a40d-0cee30ee7018" name="jetbrains.mps.lang.constraints.rules.kinds" version="0" />
+    <use id="ea3159bf-f48e-4720-bde2-86dba75f0d34" name="jetbrains.mps.lang.context.defs" version="0" />
+    <use id="e51810c5-7308-4642-bcb6-469e61b5dd18" name="jetbrains.mps.lang.constraints.msg.specification" version="0" />
+    <use id="134c38d4-e3af-4d9e-b069-1c7df0a4005d" name="jetbrains.mps.lang.constraints.rules.skeleton" version="0" />
+    <use id="b3551702-269c-4f05-ba61-58060cef4292" name="jetbrains.mps.lang.rulesAndMessages" version="0" />
+    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="6" />
+    <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
+    <use id="3ad5badc-1d9c-461c-b7b1-fa2fcd0a0ae7" name="jetbrains.mps.lang.context" version="0" />
+    <use id="ad93155d-79b2-4759-b10c-55123e763903" name="jetbrains.mps.lang.messages" version="0" />
+    <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
+  </languages>
+  <imports />
+  <registry />
+</model>
+
diff --git a/code/languages/com.mpsbasics/languages/com.mpsbasics.core/models/com.mpsbasics.core.editor.mps b/code/languages/com.mpsbasics/languages/com.mpsbasics.core/models/com.mpsbasics.core.editor.mps
new file mode 100644
index 000000000..7d4d7322d
--- /dev/null
+++ b/code/languages/com.mpsbasics/languages/com.mpsbasics.core/models/com.mpsbasics.core.editor.mps
@@ -0,0 +1,1164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)">
+  <persistence version="9" />
+  <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="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" />
+    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+  </languages>
+  <imports>
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
+    <import index="exr9" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor(MPS.Editor/)" />
+    <import index="f4zo" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.cells(MPS.Editor/)" />
+    <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" />
+    <import index="mc8f" ref="r:02240f59-d215-4642-b459-56f9f2ccb58d(de.itemis.mps.editor.celllayout.runtime.cells)" />
+    <import index="g51k" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.cells(MPS.Editor/)" />
+    <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
+    <import index="sn11" ref="r:836426ab-a6f4-4fa3-9a9c-34c02ed6ab5d(jetbrains.mps.ide.icons)" />
+    <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
+    <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
+    <import index="jan3" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.image(JDK/)" />
+  </imports>
+  <registry>
+    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
+      <concept id="1078308402140" name="jetbrains.mps.lang.editor.structure.CellModel_Custom" flags="sg" stub="8104358048506730068" index="gc7cB">
+        <child id="1176795024817" name="cellProvider" index="3YsKMw" />
+      </concept>
+      <concept id="1106270571710" name="jetbrains.mps.lang.editor.structure.CellLayout_Vertical" flags="nn" index="2iRkQZ" />
+      <concept id="1237303669825" name="jetbrains.mps.lang.editor.structure.CellLayout_Indent" flags="nn" index="l2Vlx" />
+      <concept id="1142886221719" name="jetbrains.mps.lang.editor.structure.QueryFunction_NodeCondition" flags="in" index="pkWqt" />
+      <concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
+      <concept id="1237385578942" name="jetbrains.mps.lang.editor.structure.IndentLayoutOnNewLineStyleClassItem" flags="ln" index="pVoyu" />
+      <concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
+        <child id="1080736633877" name="cellModel" index="2wV5jI" />
+      </concept>
+      <concept id="1078938745671" name="jetbrains.mps.lang.editor.structure.EditorComponentDeclaration" flags="ig" index="PKFIW" />
+      <concept id="1078939183254" name="jetbrains.mps.lang.editor.structure.CellModel_Component" flags="sg" stub="3162947552742194261" index="PMmxH">
+        <reference id="1078939183255" name="editorComponent" index="PMmxG" />
+      </concept>
+      <concept id="1186402211651" name="jetbrains.mps.lang.editor.structure.StyleSheet" flags="ng" index="V5hpn">
+        <child id="1186402402630" name="styles" index="V601i" />
+      </concept>
+      <concept id="1186403694788" name="jetbrains.mps.lang.editor.structure.ColorStyleClassItem" flags="ln" index="VaVBg">
+        <property id="1186403713874" name="color" index="Vb096" />
+        <child id="1186403803051" name="query" index="VblUZ" />
+      </concept>
+      <concept id="1186403751766" name="jetbrains.mps.lang.editor.structure.FontStyleStyleClassItem" flags="ln" index="Vb9p2">
+        <property id="1186403771423" name="style" index="Vbekb" />
+      </concept>
+      <concept id="1186404549998" name="jetbrains.mps.lang.editor.structure.ForegroundColorStyleClassItem" flags="ln" index="VechU" />
+      <concept id="1186414536763" name="jetbrains.mps.lang.editor.structure.BooleanStyleSheetItem" flags="ln" index="VOi$J">
+        <property id="1186414551515" name="flag" index="VOm3f" />
+      </concept>
+      <concept id="1186414860679" name="jetbrains.mps.lang.editor.structure.EditableStyleClassItem" flags="ln" index="VPxyj" />
+      <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
+      <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
+      <concept id="1233759184865" name="jetbrains.mps.lang.editor.structure.PunctuationRightStyleClassItem" flags="ln" index="11LMrY" />
+      <concept id="1240253180846" name="jetbrains.mps.lang.editor.structure.IndentLayoutNoWrapClassItem" flags="ln" index="34QqEe" />
+      <concept id="3383245079137382180" name="jetbrains.mps.lang.editor.structure.StyleClass" flags="ig" index="14StLt" />
+      <concept id="1225456267680" name="jetbrains.mps.lang.editor.structure.RGBColor" flags="ng" index="1iSF2X">
+        <property id="1225456424731" name="value" index="1iTho6" />
+      </concept>
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
+        <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
+      </concept>
+      <concept id="1236262245656" name="jetbrains.mps.lang.editor.structure.MatchingLabelStyleClassItem" flags="ln" index="3mYdg7">
+        <property id="1238091709220" name="labelName" index="1413C4" />
+      </concept>
+      <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
+        <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
+      </concept>
+      <concept id="1073389214265" name="jetbrains.mps.lang.editor.structure.EditorCellModel" flags="ng" index="3EYTF0">
+        <child id="1142887637401" name="renderingCondition" index="pqm2j" />
+      </concept>
+      <concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
+        <child id="1106270802874" name="cellLayout" index="2iSdaV" />
+        <child id="1073389446424" name="childCellModel" index="3EZMnx" />
+      </concept>
+      <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
+        <property id="1073389577007" name="text" index="3F0ifm" />
+      </concept>
+      <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
+        <child id="1219418656006" name="styleItem" index="3F10Kt" />
+      </concept>
+      <concept id="1225898583838" name="jetbrains.mps.lang.editor.structure.ReadOnlyModelAccessor" flags="ng" index="1HfYo3">
+        <child id="1225898971709" name="getter" index="1Hhtcw" />
+      </concept>
+      <concept id="1225900081164" name="jetbrains.mps.lang.editor.structure.CellModel_ReadOnlyModelAccessor" flags="sg" stub="3708815482283559694" index="1HlG4h">
+        <child id="1225900141900" name="modelAccessor" index="1HlULh" />
+      </concept>
+      <concept id="1161622981231" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_editorContext" flags="nn" index="1Q80Hx" />
+      <concept id="1176717841777" name="jetbrains.mps.lang.editor.structure.QueryFunction_ModelAccess_Getter" flags="in" index="3TQlhw" />
+      <concept id="1176749715029" name="jetbrains.mps.lang.editor.structure.QueryFunction_CellProvider" flags="in" index="3VJUX4" />
+      <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
+        <reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
+      </concept>
+    </language>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
+      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
+      <concept id="1179360813171" name="jetbrains.mps.baseLanguage.structure.HexIntegerLiteral" flags="nn" index="2nou5x">
+        <property id="1179360856892" name="value" index="2noCCI" />
+      </concept>
+      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
+      <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
+        <reference id="1188208074048" name="annotation" index="2AI5Lk" />
+      </concept>
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
+        <child id="1188208488637" name="annotation" index="2AJF6D" />
+      </concept>
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1197029447546" name="jetbrains.mps.baseLanguage.structure.FieldReferenceOperation" flags="nn" index="2OwXpG">
+        <reference id="1197029500499" name="fieldDeclaration" index="2Oxat5" />
+      </concept>
+      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
+        <child id="1145553007750" name="creator" index="2ShVmc" />
+      </concept>
+      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
+        <child id="1137022507850" name="body" index="2VODD2" />
+      </concept>
+      <concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA" />
+      <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
+      <concept id="1070475587102" name="jetbrains.mps.baseLanguage.structure.SuperConstructorInvocation" flags="nn" index="XkiVB" />
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+      <concept id="1182160077978" name="jetbrains.mps.baseLanguage.structure.AnonymousClassCreator" flags="nn" index="YeOm9">
+        <child id="1182160096073" name="cls" index="YeSDq" />
+      </concept>
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
+      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
+        <reference id="1144433057691" name="classifier" index="1PxDUh" />
+      </concept>
+      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
+      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
+      <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg">
+        <property id="8606350594693632173" name="isTransient" index="eg7rD" />
+        <property id="1240249534625" name="isVolatile" index="34CwA1" />
+      </concept>
+      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
+        <child id="1165602531693" name="superclass" index="1zkMxy" />
+      </concept>
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <property id="1176718929932" name="isFinal" index="3TUv4t" />
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
+      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <property id="4276006055363816570" name="isSynchronized" index="od$2w" />
+        <property id="1181808852946" name="isFinal" index="DiZV1" />
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123134" name="parameter" index="3clF46" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_">
+        <property id="1178608670077" name="isAbstract" index="1EzhhJ" />
+      </concept>
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
+        <property id="1068580123138" name="value" index="3clFbU" />
+      </concept>
+      <concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
+      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
+        <property id="1068580320021" name="value" index="3cmrfH" />
+      </concept>
+      <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
+      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
+        <child id="1068581517676" name="expression" index="3cqZAk" />
+      </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+        <child id="1068499141038" name="actualArgument" index="37wK5m" />
+      </concept>
+      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
+      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
+        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
+      </concept>
+      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
+      </concept>
+      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
+        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
+        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
+      </concept>
+      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
+      <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
+        <child id="1163668914799" name="condition" index="3K4Cdx" />
+        <child id="1163668922816" name="ifTrue" index="3K4E3e" />
+        <child id="1163668934364" name="ifFalse" index="3K4GZi" />
+      </concept>
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+      <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
+      <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
+        <reference id="1170346070688" name="classifier" index="1Y3XeK" />
+      </concept>
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
+      <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
+        <child id="1145404616321" name="leftExpression" index="2JrQYb" />
+      </concept>
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
+      <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
+        <reference id="1138056395725" name="property" index="3TsBF5" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
+      </concept>
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="PKFIW" id="4gtLUSMLjsp">
+    <property role="TrG5h" value="HeaderComponent" />
+    <ref role="1XX52x" to="tpck:h0TrEE$" resolve="INamedConcept" />
+    <node concept="3EZMnI" id="6NmtaR1SUJu" role="2wV5jI">
+      <node concept="3EZMnI" id="4gtLUSMLjsW" role="3EZMnx">
+        <node concept="VPM3Z" id="4gtLUSMLjsX" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="PMmxH" id="4xJapKM67gV" role="3EZMnx">
+          <ref role="PMmxG" node="4xJapKM66o$" resolve="iconAndNameCell" />
+        </node>
+        <node concept="l2Vlx" id="4gtLUSMLjsY" role="2iSdaV" />
+      </node>
+      <node concept="2iRkQZ" id="6NmtaR1SUJx" role="2iSdaV" />
+      <node concept="3EZMnI" id="3r83Ks0gb4c" role="3EZMnx">
+        <node concept="l2Vlx" id="3r83Ks0gb4d" role="2iSdaV" />
+        <node concept="3F0ifn" id="3r83Ks0gb4e" role="3EZMnx">
+          <property role="3F0ifm" value="model  " />
+          <ref role="1k5W1q" node="2CEi94e3iKI" resolve="PassiveTextStyle" />
+          <node concept="VPM3Z" id="3r83Ks0gyrX" role="3F10Kt">
+            <property role="VOm3f" value="false" />
+          </node>
+        </node>
+        <node concept="1HlG4h" id="3r83Ks0gb4f" role="3EZMnx">
+          <ref role="1k5W1q" node="2CEi94e3iKI" resolve="PassiveTextStyle" />
+          <node concept="1HfYo3" id="3r83Ks0gb4g" role="1HlULh">
+            <node concept="3TQlhw" id="3r83Ks0gb4h" role="1Hhtcw">
+              <node concept="3clFbS" id="3r83Ks0gb4i" role="2VODD2">
+                <node concept="3clFbF" id="3r83Ks0gb4E" role="3cqZAp">
+                  <node concept="2OqwBi" id="7RhjhI6ZvcJ" role="3clFbG">
+                    <node concept="2OqwBi" id="7RhjhI6Zu9J" role="2Oq$k0">
+                      <node concept="2JrnkZ" id="5Hxjapwed34" role="2Oq$k0">
+                        <node concept="2OqwBi" id="5Hxjapwed35" role="2JrQYb">
+                          <node concept="pncrf" id="5Hxjapwed36" role="2Oq$k0" />
+                          <node concept="I4A8Y" id="5Hxjapwed37" role="2OqNvi" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="7RhjhI6ZuQR" role="2OqNvi">
+                        <ref role="37wK5l" to="mhbf:~SModel.getName()" resolve="getName" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="7RhjhI6ZvXf" role="2OqNvi">
+                      <ref role="37wK5l" to="mhbf:~SModelName.getLongName()" resolve="getLongName" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="11LMrY" id="3r83Ks0gb4u" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="VPM3Z" id="7Ua2xCXxDA6" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+        <node concept="pVoyu" id="3r83Ks0gb4v" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="3EZMnI" id="3r83Ks0g7Sk" role="3EZMnx">
+        <node concept="l2Vlx" id="3r83Ks0g7Sl" role="2iSdaV" />
+        <node concept="3F0ifn" id="3r83Ks0gb4b" role="3EZMnx">
+          <property role="3F0ifm" value="package" />
+          <ref role="1k5W1q" node="2CEi94e3iKI" resolve="PassiveTextStyle" />
+          <node concept="VPM3Z" id="3r83Ks0gyrW" role="3F10Kt">
+            <property role="VOm3f" value="false" />
+          </node>
+        </node>
+        <node concept="1HlG4h" id="6GZLGDRsw6C" role="3EZMnx">
+          <ref role="1k5W1q" node="2CEi94e3iKI" resolve="PassiveTextStyle" />
+          <node concept="1HfYo3" id="6GZLGDRsw6D" role="1HlULh">
+            <node concept="3TQlhw" id="6GZLGDRsw6E" role="1Hhtcw">
+              <node concept="3clFbS" id="6GZLGDRsw6F" role="2VODD2">
+                <node concept="3clFbF" id="6GZLGDRsw6J" role="3cqZAp">
+                  <node concept="3K4zz7" id="6GZLGDRsw8g" role="3clFbG">
+                    <node concept="2OqwBi" id="6GZLGDRsw8D" role="3K4E3e">
+                      <node concept="pncrf" id="6GZLGDRsw8k" role="2Oq$k0" />
+                      <node concept="3TrcHB" id="6GZLGDRsw8J" role="2OqNvi">
+                        <ref role="3TsBF5" to="tpck:hnGE5uv" resolve="virtualPackage" />
+                      </node>
+                    </node>
+                    <node concept="Xl_RD" id="6GZLGDRsw99" role="3K4GZi">
+                      <property role="Xl_RC" value="" />
+                    </node>
+                    <node concept="3y3z36" id="6GZLGDRsw7S" role="3K4Cdx">
+                      <node concept="10Nm6u" id="6GZLGDRsw7V" role="3uHU7w" />
+                      <node concept="2OqwBi" id="6GZLGDRsw77" role="3uHU7B">
+                        <node concept="pncrf" id="6GZLGDRsw6M" role="2Oq$k0" />
+                        <node concept="3TrcHB" id="6GZLGDRsw7d" role="2OqNvi">
+                          <ref role="3TsBF5" to="tpck:hnGE5uv" resolve="virtualPackage" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="11LMrY" id="6GZLGDRsw6G" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+        <node concept="pVoyu" id="3r83Ks0g7Sp" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="pkWqt" id="3r83Ks0g8eZ" role="pqm2j">
+          <node concept="3clFbS" id="3r83Ks0g8f0" role="2VODD2">
+            <node concept="3clFbF" id="3r83Ks0g8f1" role="3cqZAp">
+              <node concept="3y3z36" id="3r83Ks0g8fN" role="3clFbG">
+                <node concept="10Nm6u" id="3r83Ks0g8fQ" role="3uHU7w" />
+                <node concept="2OqwBi" id="3r83Ks0g8fn" role="3uHU7B">
+                  <node concept="pncrf" id="3r83Ks0g8f2" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="3r83Ks0g8ft" role="2OqNvi">
+                    <ref role="3TsBF5" to="tpck:hnGE5uv" resolve="virtualPackage" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3F0ifn" id="6NmtaR1SUKE" role="3EZMnx" />
+      <node concept="PMmxH" id="4_pH3zvdAeV" role="3EZMnx">
+        <ref role="PMmxG" node="4_pH3zvd_oC" resolve="horizontalLine" />
+      </node>
+      <node concept="3F0ifn" id="14CuINs4Qgl" role="3EZMnx" />
+    </node>
+  </node>
+  <node concept="PKFIW" id="4_pH3zvd_oC">
+    <property role="TrG5h" value="horizontalLine" />
+    <ref role="1XX52x" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="gc7cB" id="14CuINs2S1v" role="2wV5jI">
+      <node concept="3VJUX4" id="14CuINs2S1x" role="3YsKMw">
+        <node concept="3clFbS" id="14CuINs2S1z" role="2VODD2">
+          <node concept="3clFbF" id="14CuINs3AmH" role="3cqZAp">
+            <node concept="2ShNRf" id="14CuINs3AmD" role="3clFbG">
+              <node concept="YeOm9" id="14CuINs3ALc" role="2ShVmc">
+                <node concept="1Y3b0j" id="14CuINs3ALf" role="YeSDq">
+                  <property role="2bfB8j" value="true" />
+                  <ref role="1Y3XeK" to="exr9:~AbstractCellProvider" resolve="AbstractCellProvider" />
+                  <ref role="37wK5l" to="exr9:~AbstractCellProvider.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNode)" resolve="AbstractCellProvider" />
+                  <node concept="3Tm1VV" id="14CuINs3ALg" role="1B3o_S" />
+                  <node concept="3clFb_" id="14CuINs3ALh" role="jymVt">
+                    <property role="1EzhhJ" value="false" />
+                    <property role="TrG5h" value="createEditorCell" />
+                    <property role="DiZV1" value="false" />
+                    <property role="od$2w" value="false" />
+                    <node concept="3Tm1VV" id="14CuINs3ALi" role="1B3o_S" />
+                    <node concept="3uibUv" id="14CuINs3ALk" role="3clF45">
+                      <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+                    </node>
+                    <node concept="37vLTG" id="14CuINs3ALl" role="3clF46">
+                      <property role="TrG5h" value="p0" />
+                      <node concept="3uibUv" id="14CuINs3ALm" role="1tU5fm">
+                        <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
+                      </node>
+                    </node>
+                    <node concept="3clFbS" id="14CuINs3ALn" role="3clF47">
+                      <node concept="3cpWs8" id="14CuINs3prj" role="3cqZAp">
+                        <node concept="3cpWsn" id="14CuINs3prk" role="3cpWs9">
+                          <property role="TrG5h" value="hlc" />
+                          <node concept="3uibUv" id="14CuINs3prf" role="1tU5fm">
+                            <ref role="3uigEE" to="mc8f:4U82Y3yZDCl" resolve="HorizontalLineCell" />
+                          </node>
+                          <node concept="2ShNRf" id="14CuINs3prl" role="33vP2m">
+                            <node concept="1pGfFk" id="14CuINs3prm" role="2ShVmc">
+                              <ref role="37wK5l" to="mc8f:4U82Y3yZF0a" resolve="HorizontalLineCell" />
+                              <node concept="1Q80Hx" id="14CuINs3prn" role="37wK5m" />
+                              <node concept="pncrf" id="14CuINs3pro" role="37wK5m" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="14CuINs2S6p" role="3cqZAp">
+                        <node concept="2OqwBi" id="14CuINs3$ju" role="3clFbG">
+                          <node concept="37vLTw" id="14CuINs3prp" role="2Oq$k0">
+                            <ref role="3cqZAo" node="14CuINs3prk" resolve="hlc" />
+                          </node>
+                          <node concept="liA8E" id="14CuINs3DJ7" role="2OqNvi">
+                            <ref role="37wK5l" to="mc8f:4U82Y3yZLMv" resolve="setColor" />
+                            <node concept="10M0yZ" id="4lJSf3Lk2jD" role="37wK5m">
+                              <ref role="3cqZAo" node="2CEi94emCnI" resolve="KEYWORD_BLUE" />
+                              <ref role="1PxDUh" node="4tRpPVPUEa3" resolve="BasicColors" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="14CuINs3Gwq" role="3cqZAp">
+                        <node concept="37vLTw" id="14CuINs3Gwo" role="3clFbG">
+                          <ref role="3cqZAo" node="14CuINs3prk" resolve="hlc" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="pncrf" id="14CuINs3He0" role="37wK5m" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="PKFIW" id="4xJapKM66o$">
+    <property role="TrG5h" value="iconAndNameCell" />
+    <ref role="1XX52x" to="tpck:h0TrEE$" resolve="INamedConcept" />
+    <node concept="3EZMnI" id="6NmtaR1SUJL" role="2wV5jI">
+      <node concept="VPM3Z" id="6NmtaR1SUJN" role="3F10Kt">
+        <property role="VOm3f" value="false" />
+      </node>
+      <node concept="gc7cB" id="14CuINs5Us6" role="3EZMnx">
+        <node concept="3VJUX4" id="14CuINs5Us8" role="3YsKMw">
+          <node concept="3clFbS" id="14CuINs5Usa" role="2VODD2">
+            <node concept="3clFbF" id="14CuINs5Uvr" role="3cqZAp">
+              <node concept="2ShNRf" id="14CuINs5Uvp" role="3clFbG">
+                <node concept="1pGfFk" id="14CuINs5UTp" role="2ShVmc">
+                  <ref role="37wK5l" node="DubiFB4e4X" resolve="IconCell" />
+                  <node concept="pncrf" id="14CuINs5UXj" role="37wK5m" />
+                  <node concept="3cmrfG" id="14CuINs5Vdl" role="37wK5m">
+                    <property role="3cmrfH" value="3" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3F0A7n" id="6NmtaR1SUKu" role="3EZMnx">
+        <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+      </node>
+      <node concept="l2Vlx" id="6NmtaR1SUJQ" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="312cEu" id="DubiFB4e4O">
+    <property role="TrG5h" value="IconCell" />
+    <property role="3GE5qa" value="cells.other" />
+    <node concept="2tJIrI" id="xsq72MHxwy" role="jymVt" />
+    <node concept="3Tm1VV" id="DubiFB4e4P" role="1B3o_S" />
+    <node concept="3uibUv" id="DubiFB4e4Q" role="1zkMxy">
+      <ref role="3uigEE" to="exr9:~AbstractCellProvider" resolve="AbstractCellProvider" />
+    </node>
+    <node concept="312cEg" id="DubiFB4e4R" role="jymVt">
+      <property role="TrG5h" value="myNode" />
+      <property role="3TUv4t" value="true" />
+      <node concept="3Tm6S6" id="DubiFB4e4S" role="1B3o_S" />
+      <node concept="3Tqbb2" id="DubiFB4e4T" role="1tU5fm" />
+    </node>
+    <node concept="312cEg" id="DubiFBVAkw" role="jymVt">
+      <property role="TrG5h" value="voffset" />
+      <property role="3TUv4t" value="true" />
+      <node concept="3Tm6S6" id="DubiFBVAkx" role="1B3o_S" />
+      <node concept="10Oyi0" id="DubiFBVAkz" role="1tU5fm" />
+    </node>
+    <node concept="3clFbW" id="DubiFB4e4X" role="jymVt">
+      <node concept="3cqZAl" id="DubiFB4e4Y" role="3clF45" />
+      <node concept="3Tm1VV" id="DubiFB4e4Z" role="1B3o_S" />
+      <node concept="3clFbS" id="DubiFB4e50" role="3clF47">
+        <node concept="XkiVB" id="6V6nHEzQ9uz" role="3cqZAp">
+          <ref role="37wK5l" to="exr9:~AbstractCellProvider.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNode)" resolve="AbstractCellProvider" />
+          <node concept="37vLTw" id="6V6nHEzQ9C2" role="37wK5m">
+            <ref role="3cqZAo" node="DubiFB4e57" resolve="node" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="DubiFB4e51" role="3cqZAp">
+          <node concept="37vLTI" id="DubiFB4e52" role="3clFbG">
+            <node concept="37vLTw" id="DubiFB4e53" role="37vLTx">
+              <ref role="3cqZAo" node="DubiFB4e57" resolve="node" />
+            </node>
+            <node concept="2OqwBi" id="DubiFB4e54" role="37vLTJ">
+              <node concept="Xjq3P" id="DubiFB4e55" role="2Oq$k0" />
+              <node concept="2OwXpG" id="DubiFB4e56" role="2OqNvi">
+                <ref role="2Oxat5" node="DubiFB4e4R" resolve="myNode" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="DubiFBVAk$" role="3cqZAp">
+          <node concept="37vLTI" id="DubiFBVAkA" role="3clFbG">
+            <node concept="2OqwBi" id="DubiFBVAkE" role="37vLTJ">
+              <node concept="Xjq3P" id="DubiFBVAkH" role="2Oq$k0" />
+              <node concept="2OwXpG" id="DubiFBVAkD" role="2OqNvi">
+                <ref role="2Oxat5" node="DubiFBVAkw" resolve="voffset" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="DubiFBVAkI" role="37vLTx">
+              <ref role="3cqZAo" node="DubiFBVzl1" resolve="voffset" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="DubiFB4e57" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <node concept="3Tqbb2" id="DubiFB4e58" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="DubiFBVzl1" role="3clF46">
+        <property role="TrG5h" value="voffset" />
+        <node concept="10Oyi0" id="DubiFBVzwF" role="1tU5fm" />
+      </node>
+    </node>
+    <node concept="3clFb_" id="DubiFB4e5t" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="createEditorCell" />
+      <property role="DiZV1" value="false" />
+      <node concept="3Tm1VV" id="DubiFB4e5u" role="1B3o_S" />
+      <node concept="3uibUv" id="DubiFB4e5v" role="3clF45">
+        <ref role="3uigEE" to="g51k:~EditorCell" resolve="EditorCell" />
+      </node>
+      <node concept="37vLTG" id="DubiFB4e5w" role="3clF46">
+        <property role="TrG5h" value="context" />
+        <node concept="3uibUv" id="7XIXMBMXeR9" role="1tU5fm">
+          <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="DubiFB4e5y" role="3clF47">
+        <node concept="3cpWs6" id="DubiFB4e7p" role="3cqZAp">
+          <node concept="2ShNRf" id="1dVWdop08sE" role="3cqZAk">
+            <node concept="1pGfFk" id="1dVWdop08sF" role="2ShVmc">
+              <ref role="37wK5l" node="1dVWdooZXce" resolve="IconCell.MyEditorCell_Basic" />
+              <node concept="37vLTw" id="1dVWdop08sG" role="37wK5m">
+                <ref role="3cqZAo" node="DubiFB4e5w" resolve="context" />
+              </node>
+              <node concept="2OqwBi" id="1dVWdop08sH" role="37wK5m">
+                <node concept="2OwXpG" id="1dVWdop08sI" role="2OqNvi">
+                  <ref role="2Oxat5" node="DubiFB4e4R" resolve="myNode" />
+                </node>
+                <node concept="Xjq3P" id="1dVWdop08sJ" role="2Oq$k0" />
+              </node>
+              <node concept="37vLTw" id="1dVWdop08sK" role="37wK5m">
+                <ref role="3cqZAo" node="DubiFB4e5w" resolve="context" />
+              </node>
+              <node concept="37vLTw" id="1dVWdop08sL" role="37wK5m">
+                <ref role="3cqZAo" node="DubiFBVAkw" resolve="voffset" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1dVWdop01TR" role="jymVt" />
+    <node concept="312cEu" id="1dVWdooZXca" role="jymVt">
+      <property role="TrG5h" value="MyEditorCell_Basic" />
+      <property role="2bfB8j" value="true" />
+      <node concept="312cEg" id="DubiFB6mE3" role="jymVt">
+        <property role="34CwA1" value="false" />
+        <property role="eg7rD" value="false" />
+        <property role="TrG5h" value="icon" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3Tm6S6" id="DubiFB6lCh" role="1B3o_S" />
+        <node concept="3uibUv" id="DubiFB6mCz" role="1tU5fm">
+          <ref role="3uigEE" to="dxuu:~Icon" resolve="Icon" />
+        </node>
+      </node>
+      <node concept="312cEg" id="1dVWdop04xK" role="jymVt">
+        <property role="TrG5h" value="voffset" />
+        <node concept="3Tm6S6" id="1dVWdop04xL" role="1B3o_S" />
+        <node concept="10Oyi0" id="1dVWdop04xN" role="1tU5fm" />
+      </node>
+      <node concept="2tJIrI" id="1dVWdooZZi5" role="jymVt" />
+      <node concept="3clFbW" id="1dVWdooZXce" role="jymVt">
+        <node concept="3clFbS" id="1dVWdooZXcf" role="3clF47">
+          <node concept="XkiVB" id="1dVWdooZXck" role="3cqZAp">
+            <ref role="37wK5l" to="g51k:~EditorCell_Basic.&lt;init&gt;(jetbrains.mps.openapi.editor.EditorContext,org.jetbrains.mps.openapi.model.SNode)" resolve="EditorCell_Basic" />
+            <node concept="37vLTw" id="1dVWdooZXci" role="37wK5m">
+              <ref role="3cqZAo" node="1dVWdooZXc5" resolve="p0" />
+            </node>
+            <node concept="37vLTw" id="1dVWdooZXcj" role="37wK5m">
+              <ref role="3cqZAo" node="1dVWdooZXc8" resolve="node" />
+            </node>
+          </node>
+          <node concept="3clFbF" id="DubiFB6nGu" role="3cqZAp">
+            <node concept="37vLTI" id="DubiFB6pof" role="3clFbG">
+              <node concept="2OqwBi" id="DubiFB6nJd" role="37vLTJ">
+                <node concept="Xjq3P" id="DubiFB6nGs" role="2Oq$k0" />
+                <node concept="2OwXpG" id="DubiFB6oOs" role="2OqNvi">
+                  <ref role="2Oxat5" node="DubiFB6mE3" resolve="icon" />
+                </node>
+              </node>
+              <node concept="2OqwBi" id="1vcsY82Hn7h" role="37vLTx">
+                <node concept="liA8E" id="1vcsY82HoX$" role="2OqNvi">
+                  <ref role="37wK5l" to="sn11:192HKKPOd3m" resolve="getIconFor" />
+                  <node concept="37vLTw" id="1vcsY82HpvB" role="37wK5m">
+                    <ref role="3cqZAo" node="1dVWdooZXc8" resolve="node" />
+                  </node>
+                </node>
+                <node concept="2YIFZM" id="1vcsY82Hovy" role="2Oq$k0">
+                  <ref role="37wK5l" to="sn11:5UC$YgehaLf" resolve="getInstance" />
+                  <ref role="1Pybhc" to="sn11:192HKKPMXeL" resolve="GlobalIconManager" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="1dVWdop04xO" role="3cqZAp">
+            <node concept="37vLTI" id="1dVWdop04xQ" role="3clFbG">
+              <node concept="2OqwBi" id="1dVWdop04xU" role="37vLTJ">
+                <node concept="Xjq3P" id="1dVWdop04xX" role="2Oq$k0" />
+                <node concept="2OwXpG" id="1dVWdop04xT" role="2OqNvi">
+                  <ref role="2Oxat5" node="1dVWdop04xK" resolve="voffset" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="1dVWdop04xY" role="37vLTx">
+                <ref role="3cqZAo" node="1dVWdop03ru" resolve="voffset" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="1dVWdooZXcg" role="1B3o_S" />
+        <node concept="3cqZAl" id="1dVWdooZXch" role="3clF45" />
+        <node concept="37vLTG" id="1dVWdooZXc5" role="3clF46">
+          <property role="TrG5h" value="p0" />
+          <node concept="3uibUv" id="1dVWdooZXc6" role="1tU5fm">
+            <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
+          </node>
+          <node concept="2AHcQZ" id="1dVWdooZXc7" role="2AJF6D">
+            <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="1dVWdooZXc8" role="3clF46">
+          <property role="TrG5h" value="node" />
+          <node concept="3uibUv" id="1dVWdooZXc9" role="1tU5fm">
+            <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="1dVWdooZXc3" role="3clF46">
+          <property role="TrG5h" value="context" />
+          <node concept="3uibUv" id="1dVWdooZXc4" role="1tU5fm">
+            <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="1dVWdop03ru" role="3clF46">
+          <property role="TrG5h" value="voffset" />
+          <node concept="10Oyi0" id="1dVWdop03ET" role="1tU5fm" />
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="1dVWdooZXcc" role="1B3o_S" />
+      <node concept="2tJIrI" id="1dVWdop06ml" role="jymVt" />
+      <node concept="3clFb_" id="DubiFB4e5I" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="paintContent" />
+        <node concept="3Tm1VV" id="DubiFB4e5J" role="1B3o_S" />
+        <node concept="3cqZAl" id="DubiFB4e5K" role="3clF45" />
+        <node concept="37vLTG" id="DubiFB4e5L" role="3clF46">
+          <property role="TrG5h" value="g" />
+          <node concept="3uibUv" id="DubiFB4e5M" role="1tU5fm">
+            <ref role="3uigEE" to="z60i:~Graphics" resolve="Graphics" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="DubiFB4e5N" role="3clF46">
+          <property role="TrG5h" value="parentSettings" />
+          <node concept="3uibUv" id="DubiFB4e5O" role="1tU5fm">
+            <ref role="3uigEE" to="g51k:~ParentSettings" resolve="ParentSettings" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="DubiFB4e5P" role="3clF47">
+          <node concept="3cpWs8" id="DubiFB6sMC" role="3cqZAp">
+            <node concept="3cpWsn" id="DubiFB6sMD" role="3cpWs9">
+              <property role="TrG5h" value="img" />
+              <node concept="3uibUv" id="DubiFB6sME" role="1tU5fm">
+                <ref role="3uigEE" to="jan3:~BufferedImage" resolve="BufferedImage" />
+              </node>
+              <node concept="2ShNRf" id="DubiFB6tmq" role="33vP2m">
+                <node concept="1pGfFk" id="DubiFB6tmp" role="2ShVmc">
+                  <ref role="37wK5l" to="jan3:~BufferedImage.&lt;init&gt;(int,int,int)" resolve="BufferedImage" />
+                  <node concept="2OqwBi" id="DubiFB6uDp" role="37wK5m">
+                    <node concept="37vLTw" id="DubiFB6u_7" role="2Oq$k0">
+                      <ref role="3cqZAo" node="DubiFB6mE3" resolve="icon" />
+                    </node>
+                    <node concept="liA8E" id="DubiFB6va8" role="2OqNvi">
+                      <ref role="37wK5l" to="dxuu:~Icon.getIconWidth()" resolve="getIconWidth" />
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="DubiFB6wes" role="37wK5m">
+                    <node concept="37vLTw" id="DubiFB6vHc" role="2Oq$k0">
+                      <ref role="3cqZAo" node="DubiFB6mE3" resolve="icon" />
+                    </node>
+                    <node concept="liA8E" id="DubiFB6wKk" role="2OqNvi">
+                      <ref role="37wK5l" to="dxuu:~Icon.getIconHeight()" resolve="getIconHeight" />
+                    </node>
+                  </node>
+                  <node concept="10M0yZ" id="DubiFB6y4t" role="37wK5m">
+                    <ref role="3cqZAo" to="jan3:~BufferedImage.TYPE_INT_ARGB" resolve="TYPE_INT_ARGB" />
+                    <ref role="1PxDUh" to="jan3:~BufferedImage" resolve="BufferedImage" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="DubiFB6ABN" role="3cqZAp">
+            <node concept="2OqwBi" id="DubiFB6B8g" role="3clFbG">
+              <node concept="37vLTw" id="DubiFB6ABM" role="2Oq$k0">
+                <ref role="3cqZAo" node="DubiFB6mE3" resolve="icon" />
+              </node>
+              <node concept="liA8E" id="DubiFB6BHb" role="2OqNvi">
+                <ref role="37wK5l" to="dxuu:~Icon.paintIcon(java.awt.Component,java.awt.Graphics,int,int)" resolve="paintIcon" />
+                <node concept="10Nm6u" id="DubiFB6CUl" role="37wK5m" />
+                <node concept="2OqwBi" id="DubiFB6Dvd" role="37wK5m">
+                  <node concept="37vLTw" id="DubiFB6CXV" role="2Oq$k0">
+                    <ref role="3cqZAo" node="DubiFB6sMD" resolve="img" />
+                  </node>
+                  <node concept="liA8E" id="DubiFB6F_a" role="2OqNvi">
+                    <ref role="37wK5l" to="jan3:~BufferedImage.getGraphics()" resolve="getGraphics" />
+                  </node>
+                </node>
+                <node concept="3cmrfG" id="DubiFB6GS1" role="37wK5m">
+                  <property role="3cmrfH" value="0" />
+                </node>
+                <node concept="3cmrfG" id="DubiFB6GUS" role="37wK5m">
+                  <property role="3cmrfH" value="0" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="DubiFBOoku" role="3cqZAp">
+            <node concept="3cpWsn" id="DubiFBOokv" role="3cpWs9">
+              <property role="TrG5h" value="parent" />
+              <node concept="3uibUv" id="DubiFBOokw" role="1tU5fm">
+                <ref role="3uigEE" to="g51k:~EditorCell_Collection" resolve="EditorCell_Collection" />
+              </node>
+              <node concept="2OqwBi" id="DubiFBOokx" role="33vP2m">
+                <node concept="liA8E" id="DubiFBOoky" role="2OqNvi">
+                  <ref role="37wK5l" to="g51k:~EditorCell_Basic.getParent()" resolve="getParent" />
+                </node>
+                <node concept="Xjq3P" id="DubiFBOokz" role="2Oq$k0" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="DubiFB5RoN" role="3cqZAp">
+            <node concept="2OqwBi" id="DubiFB5Rq9" role="3clFbG">
+              <node concept="37vLTw" id="DubiFB5RoM" role="2Oq$k0">
+                <ref role="3cqZAo" node="DubiFB4e5L" resolve="g" />
+              </node>
+              <node concept="liA8E" id="DubiFB5RUO" role="2OqNvi">
+                <ref role="37wK5l" to="z60i:~Graphics.drawImage(java.awt.Image,int,int,java.awt.image.ImageObserver)" resolve="drawImage" />
+                <node concept="37vLTw" id="DubiFB6_ih" role="37wK5m">
+                  <ref role="3cqZAo" node="DubiFB6sMD" resolve="img" />
+                </node>
+                <node concept="2OqwBi" id="DubiFBOsU5" role="37wK5m">
+                  <node concept="37vLTw" id="DubiFBOrMY" role="2Oq$k0">
+                    <ref role="3cqZAo" node="DubiFBOokv" resolve="parent" />
+                  </node>
+                  <node concept="liA8E" id="DubiFBOxB5" role="2OqNvi">
+                    <ref role="37wK5l" to="g51k:~EditorCell_Basic.getX()" resolve="getX" />
+                  </node>
+                </node>
+                <node concept="3cpWs3" id="DubiFBSgqw" role="37wK5m">
+                  <node concept="37vLTw" id="1dVWdop07lB" role="3uHU7w">
+                    <ref role="3cqZAo" node="1dVWdop04xK" resolve="voffset" />
+                  </node>
+                  <node concept="2OqwBi" id="DubiFBO$o2" role="3uHU7B">
+                    <node concept="37vLTw" id="DubiFBOz49" role="2Oq$k0">
+                      <ref role="3cqZAo" node="DubiFBOokv" resolve="parent" />
+                    </node>
+                    <node concept="liA8E" id="DubiFBOCoH" role="2OqNvi">
+                      <ref role="37wK5l" to="g51k:~EditorCell_Basic.getY()" resolve="getY" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="10Nm6u" id="DubiFB6btx" role="37wK5m" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="1dVWdop0649" role="jymVt" />
+      <node concept="3clFb_" id="DubiFB4e73" role="jymVt">
+        <property role="TrG5h" value="relayoutImpl" />
+        <node concept="3cqZAl" id="DubiFB4e74" role="3clF45" />
+        <node concept="3Tm1VV" id="DubiFB4e75" role="1B3o_S" />
+        <node concept="3clFbS" id="DubiFB4e76" role="3clF47">
+          <node concept="3clFbF" id="DubiFB4e77" role="3cqZAp">
+            <node concept="37vLTI" id="DubiFB4e78" role="3clFbG">
+              <node concept="2OqwBi" id="DubiFB6K4D" role="37vLTx">
+                <node concept="37vLTw" id="DubiFB6Juc" role="2Oq$k0">
+                  <ref role="3cqZAo" node="DubiFB6mE3" resolve="icon" />
+                </node>
+                <node concept="liA8E" id="DubiFB6KUs" role="2OqNvi">
+                  <ref role="37wK5l" to="dxuu:~Icon.getIconWidth()" resolve="getIconWidth" />
+                </node>
+              </node>
+              <node concept="2OqwBi" id="DubiFB4e7a" role="37vLTJ">
+                <node concept="2OwXpG" id="DubiFB4e7b" role="2OqNvi">
+                  <ref role="2Oxat5" to="g51k:~EditorCell_Basic.myWidth" resolve="myWidth" />
+                </node>
+                <node concept="Xjq3P" id="DubiFB4e7c" role="2Oq$k0" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="DubiFB4e7d" role="3cqZAp">
+            <node concept="37vLTI" id="DubiFB4e7e" role="3clFbG">
+              <node concept="2OqwBi" id="DubiFB4e7f" role="37vLTJ">
+                <node concept="2OwXpG" id="DubiFB4e7g" role="2OqNvi">
+                  <ref role="2Oxat5" to="g51k:~EditorCell_Basic.myHeight" resolve="myHeight" />
+                </node>
+                <node concept="Xjq3P" id="DubiFB4e7h" role="2Oq$k0" />
+              </node>
+              <node concept="2OqwBi" id="DubiFB6Mb8" role="37vLTx">
+                <node concept="37vLTw" id="DubiFB6LS_" role="2Oq$k0">
+                  <ref role="3cqZAo" node="DubiFB6mE3" resolve="icon" />
+                </node>
+                <node concept="liA8E" id="DubiFB6N8I" role="2OqNvi">
+                  <ref role="37wK5l" to="dxuu:~Icon.getIconHeight()" resolve="getIconHeight" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="1dVWdop05KZ" role="jymVt" />
+      <node concept="3clFb_" id="DubiFB4e7j" role="jymVt">
+        <property role="TrG5h" value="isLastCaretPosition" />
+        <node concept="10P_77" id="DubiFB4e7k" role="3clF45" />
+        <node concept="3Tm1VV" id="DubiFB4e7l" role="1B3o_S" />
+        <node concept="3clFbS" id="DubiFB4e7m" role="3clF47">
+          <node concept="3cpWs6" id="DubiFB4e7n" role="3cqZAp">
+            <node concept="3clFbT" id="DubiFB4e7o" role="3cqZAk">
+              <property role="3clFbU" value="true" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="1dVWdooZXcd" role="1zkMxy">
+        <ref role="3uigEE" to="g51k:~EditorCell_Basic" resolve="EditorCell_Basic" />
+      </node>
+    </node>
+  </node>
+  <node concept="312cEu" id="4tRpPVPUEa3">
+    <property role="TrG5h" value="BasicColors" />
+    <node concept="3Tm1VV" id="4tRpPVPUEa4" role="1B3o_S" />
+    <node concept="Wx3nA" id="4tRpPVPUEa5" role="jymVt">
+      <property role="TrG5h" value="COMMENT_GREEN" />
+      <node concept="3Tm1VV" id="4tRpPVPUEpv" role="1B3o_S" />
+      <node concept="3uibUv" id="4tRpPVPUEac" role="1tU5fm">
+        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+      </node>
+      <node concept="2ShNRf" id="4tRpPVPUEae" role="33vP2m">
+        <node concept="1pGfFk" id="4tRpPVPUEaf" role="2ShVmc">
+          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
+          <node concept="3cmrfG" id="4tRpPVPUEag" role="37wK5m">
+            <property role="3cmrfH" value="14" />
+          </node>
+          <node concept="3cmrfG" id="4tRpPVPUEai" role="37wK5m">
+            <property role="3cmrfH" value="117" />
+          </node>
+          <node concept="3cmrfG" id="4tRpPVPUEp9" role="37wK5m">
+            <property role="3cmrfH" value="35" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="Wx3nA" id="4tRpPVPUEpG" role="jymVt">
+      <property role="TrG5h" value="TODO_BLUE" />
+      <node concept="3Tm1VV" id="4tRpPVPUEpH" role="1B3o_S" />
+      <node concept="3uibUv" id="4tRpPVPUEpI" role="1tU5fm">
+        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+      </node>
+      <node concept="2ShNRf" id="4tRpPVPUEpJ" role="33vP2m">
+        <node concept="1pGfFk" id="4tRpPVPUEpK" role="2ShVmc">
+          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
+          <node concept="3cmrfG" id="4tRpPVPUEpL" role="37wK5m">
+            <property role="3cmrfH" value="15" />
+          </node>
+          <node concept="3cmrfG" id="4tRpPVPUEpM" role="37wK5m">
+            <property role="3cmrfH" value="32" />
+          </node>
+          <node concept="3cmrfG" id="4tRpPVPUEpN" role="37wK5m">
+            <property role="3cmrfH" value="219" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="y826GFznfV" role="jymVt" />
+    <node concept="Wx3nA" id="2CEi94dud1E" role="jymVt">
+      <property role="TrG5h" value="COMMENT_GREY" />
+      <node concept="3Tm1VV" id="2CEi94dud1F" role="1B3o_S" />
+      <node concept="3uibUv" id="2CEi94dud1G" role="1tU5fm">
+        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+      </node>
+      <node concept="2ShNRf" id="2CEi94dud1H" role="33vP2m">
+        <node concept="1pGfFk" id="2CEi94dud1I" role="2ShVmc">
+          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
+          <node concept="2nou5x" id="y826GFznhq" role="37wK5m">
+            <property role="2noCCI" value="80" />
+          </node>
+          <node concept="2nou5x" id="y826GFznsv" role="37wK5m">
+            <property role="2noCCI" value="80" />
+          </node>
+          <node concept="2nou5x" id="y826GFznut" role="37wK5m">
+            <property role="2noCCI" value="80" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="Wx3nA" id="2CEi94emCnI" role="jymVt">
+      <property role="TrG5h" value="KEYWORD_BLUE" />
+      <node concept="3Tm1VV" id="2CEi94emCnJ" role="1B3o_S" />
+      <node concept="3uibUv" id="2CEi94emCnK" role="1tU5fm">
+        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+      </node>
+      <node concept="2ShNRf" id="5v_KyvNS5Np" role="33vP2m">
+        <node concept="1pGfFk" id="5v_KyvNSrAx" role="2ShVmc">
+          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
+          <node concept="3cmrfG" id="5v_KyvNSrBc" role="37wK5m">
+            <property role="3cmrfH" value="0" />
+          </node>
+          <node concept="3cmrfG" id="5v_KyvNSrT4" role="37wK5m">
+            <property role="3cmrfH" value="0" />
+          </node>
+          <node concept="2nou5x" id="5v_KyvNSsd_" role="37wK5m">
+            <property role="2noCCI" value="80" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="Wx3nA" id="3Q78AXIZrq" role="jymVt">
+      <property role="TrG5h" value="KEYWORD_LIGHT_BLUE" />
+      <node concept="3Tm1VV" id="3Q78AXIZrr" role="1B3o_S" />
+      <node concept="3uibUv" id="3Q78AXIZrs" role="1tU5fm">
+        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+      </node>
+      <node concept="2ShNRf" id="3Q78AXIZrt" role="33vP2m">
+        <node concept="1pGfFk" id="3Q78AXIZru" role="2ShVmc">
+          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
+          <node concept="3cmrfG" id="3Q78AXIZrv" role="37wK5m">
+            <property role="3cmrfH" value="0" />
+          </node>
+          <node concept="3cmrfG" id="3Q78AXIZrw" role="37wK5m">
+            <property role="3cmrfH" value="210" />
+          </node>
+          <node concept="3cmrfG" id="3Q78AXJbUG" role="37wK5m">
+            <property role="3cmrfH" value="255" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="Wx3nA" id="KwKRgpJugV" role="jymVt">
+      <property role="TrG5h" value="KEYWORD_DARK_BLUE" />
+      <node concept="3Tm1VV" id="KwKRgpJugW" role="1B3o_S" />
+      <node concept="3uibUv" id="KwKRgpJugX" role="1tU5fm">
+        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+      </node>
+      <node concept="2ShNRf" id="KwKRgpJugY" role="33vP2m">
+        <node concept="1pGfFk" id="KwKRgpJugZ" role="2ShVmc">
+          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
+          <node concept="3cmrfG" id="KwKRgpJuh0" role="37wK5m">
+            <property role="3cmrfH" value="0" />
+          </node>
+          <node concept="2nou5x" id="KwKRgpNzg$" role="37wK5m">
+            <property role="2noCCI" value="30" />
+          </node>
+          <node concept="2nou5x" id="KwKRgpJuh2" role="37wK5m">
+            <property role="2noCCI" value="80" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4afdSTbPIoh" role="jymVt" />
+    <node concept="Wx3nA" id="4afdSTbPIhl" role="jymVt">
+      <property role="TrG5h" value="KEYWORD_GREEN_DARK" />
+      <node concept="3Tm1VV" id="4afdSTbPIhm" role="1B3o_S" />
+      <node concept="3uibUv" id="4afdSTbPIhn" role="1tU5fm">
+        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+      </node>
+      <node concept="2YIFZM" id="42Yf_hF11Mi" role="33vP2m">
+        <ref role="37wK5l" to="z60i:~Color.decode(java.lang.String)" resolve="decode" />
+        <ref role="1Pybhc" to="z60i:~Color" resolve="Color" />
+        <node concept="Xl_RD" id="42Yf_hF11Mj" role="37wK5m">
+          <property role="Xl_RC" value="#01C60B" />
+        </node>
+      </node>
+    </node>
+    <node concept="Wx3nA" id="4afdSTbQoB4" role="jymVt">
+      <property role="TrG5h" value="KEYWORD_GREEN_LIGHT" />
+      <node concept="3Tm1VV" id="4afdSTbQoB5" role="1B3o_S" />
+      <node concept="3uibUv" id="4afdSTbQoB6" role="1tU5fm">
+        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+      </node>
+      <node concept="2YIFZM" id="42Yf_hF11Md" role="33vP2m">
+        <ref role="1Pybhc" to="z60i:~Color" resolve="Color" />
+        <ref role="37wK5l" to="z60i:~Color.decode(java.lang.String)" resolve="decode" />
+        <node concept="Xl_RD" id="42Yf_hF11Me" role="37wK5m">
+          <property role="Xl_RC" value="#017507" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="KwKRgpJueU" role="jymVt" />
+    <node concept="2tJIrI" id="4afdSTbPIfQ" role="jymVt" />
+    <node concept="Wx3nA" id="y826GEUxbz" role="jymVt">
+      <property role="TrG5h" value="INACTIVE" />
+      <node concept="3Tm1VV" id="y826GEUxb$" role="1B3o_S" />
+      <node concept="3uibUv" id="y826GEUxb_" role="1tU5fm">
+        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+      </node>
+      <node concept="10M0yZ" id="y826GEUBj_" role="33vP2m">
+        <ref role="1PxDUh" to="z60i:~Color" resolve="Color" />
+        <ref role="3cqZAo" to="z60i:~Color.GRAY" resolve="GRAY" />
+      </node>
+    </node>
+    <node concept="Wx3nA" id="y826GFqdaI" role="jymVt">
+      <property role="TrG5h" value="STRING" />
+      <node concept="3Tm1VV" id="y826GFqdaJ" role="1B3o_S" />
+      <node concept="3uibUv" id="y826GFqdaK" role="1tU5fm">
+        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+      </node>
+      <node concept="2ShNRf" id="y826GFvxvw" role="33vP2m">
+        <node concept="1pGfFk" id="y826GFvTJ$" role="2ShVmc">
+          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
+          <node concept="3cmrfG" id="y826GFvTKd" role="37wK5m">
+            <property role="3cmrfH" value="0" />
+          </node>
+          <node concept="2nou5x" id="y826GFzn4Q" role="37wK5m">
+            <property role="2noCCI" value="80" />
+          </node>
+          <node concept="3cmrfG" id="y826GFvUwq" role="37wK5m">
+            <property role="3cmrfH" value="0" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="Wx3nA" id="y826GHHfBE" role="jymVt">
+      <property role="TrG5h" value="METADATA" />
+      <node concept="3Tm1VV" id="y826GHHfBF" role="1B3o_S" />
+      <node concept="3uibUv" id="y826GHHfBG" role="1tU5fm">
+        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+      </node>
+      <node concept="2ShNRf" id="y826GHHfBH" role="33vP2m">
+        <node concept="1pGfFk" id="y826GHHfBI" role="2ShVmc">
+          <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
+          <node concept="2nou5x" id="y826GHHCHq" role="37wK5m">
+            <property role="2noCCI" value="80" />
+          </node>
+          <node concept="2nou5x" id="y826GHHfBK" role="37wK5m">
+            <property role="2noCCI" value="80" />
+          </node>
+          <node concept="3cmrfG" id="y826GHHfBL" role="37wK5m">
+            <property role="3cmrfH" value="0" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2CEi94dud0W" role="jymVt" />
+  </node>
+  <node concept="V5hpn" id="6NmtaR1SVqz">
+    <property role="TrG5h" value="basic_styles" />
+    <node concept="14StLt" id="6NmtaR1SVrw" role="V601i">
+      <property role="TrG5h" value="KeywordStyle" />
+      <node concept="Vb9p2" id="6NmtaR1SWf7" role="3F10Kt">
+        <property role="Vbekb" value="g1_k_vY/BOLD" />
+      </node>
+      <node concept="VechU" id="6NmtaR1SWfp" role="3F10Kt">
+        <property role="Vb096" value="g1_eI4o/darkBlue" />
+      </node>
+    </node>
+    <node concept="14StLt" id="2CEi94dh36z" role="V601i">
+      <property role="TrG5h" value="ParensStyle" />
+      <node concept="3mYdg7" id="2CEi94dh36$" role="3F10Kt">
+        <property role="1413C4" value="parenthesis" />
+      </node>
+      <node concept="34QqEe" id="2CEi94dhicm" role="3F10Kt">
+        <property role="VOm3f" value="true" />
+      </node>
+      <node concept="Vb9p2" id="2CEi94dhicz" role="3F10Kt" />
+      <node concept="11L4FC" id="6UJZwEqlSvq" role="3F10Kt">
+        <property role="VOm3f" value="true" />
+      </node>
+    </node>
+    <node concept="14StLt" id="hFDgi_W" role="V601i">
+      <property role="TrG5h" value="Semicolon" />
+      <node concept="VPxyj" id="hZKAF6K" role="3F10Kt" />
+      <node concept="11L4FC" id="hX5Crjo" role="3F10Kt">
+        <property role="VOm3f" value="true" />
+      </node>
+      <node concept="34QqEe" id="3yOl4C1pxqc" role="3F10Kt">
+        <property role="VOm3f" value="true" />
+      </node>
+      <node concept="Vb9p2" id="1l_ZFOWqvCI" role="3F10Kt" />
+    </node>
+    <node concept="14StLt" id="2CEi94dgUHC" role="V601i">
+      <property role="TrG5h" value="NumberStyle" />
+      <node concept="VechU" id="2CEi94dgUHD" role="3F10Kt">
+        <property role="Vb096" value="6cZGtrcKCoS/black" />
+        <node concept="1iSF2X" id="2CEi94dgUHE" role="VblUZ">
+          <property role="1iTho6" value="0000FF" />
+        </node>
+      </node>
+      <node concept="Vb9p2" id="2CEi94dgUHF" role="3F10Kt" />
+    </node>
+    <node concept="14StLt" id="y826GHffn9" role="V601i">
+      <property role="TrG5h" value="OpStyle" />
+      <node concept="VechU" id="y826GHffoW" role="3F10Kt">
+        <property role="Vb096" value="6cZGtrcKCoS/black" />
+      </node>
+      <node concept="Vb9p2" id="y826GHffoY" role="3F10Kt" />
+    </node>
+    <node concept="14StLt" id="2CEi94e3iKI" role="V601i">
+      <property role="TrG5h" value="PassiveTextStyle" />
+      <node concept="VPxyj" id="2CEi94dUSQp" role="3F10Kt">
+        <property role="VOm3f" value="false" />
+      </node>
+      <node concept="Vb9p2" id="2CEi94e7jvE" role="3F10Kt" />
+      <node concept="VechU" id="2CEi94dZG7m" role="3F10Kt">
+        <property role="Vb096" value="fLJRk5B/darkGray" />
+      </node>
+    </node>
+    <node concept="14StLt" id="67ygqsM9cDK" role="V601i">
+      <property role="TrG5h" value="EditingHintStyle" />
+      <node concept="VPxyj" id="67ygqsM9cDL" role="3F10Kt" />
+      <node concept="Vb9p2" id="67ygqsM9cDM" role="3F10Kt">
+        <property role="Vbekb" value="g1_kEg4/ITALIC" />
+      </node>
+      <node concept="VechU" id="67ygqsM9cDN" role="3F10Kt">
+        <property role="Vb096" value="fLJRk5A/lightGray" />
+      </node>
+    </node>
+  </node>
+</model>
+
diff --git a/code/languages/com.mpsbasics/languages/com.mpsbasics.core/models/com.mpsbasics.core.structure.mps b/code/languages/com.mpsbasics/languages/com.mpsbasics.core/models/com.mpsbasics.core.structure.mps
new file mode 100644
index 000000000..a305e0979
--- /dev/null
+++ b/code/languages/com.mpsbasics/languages/com.mpsbasics.core/models/com.mpsbasics.core.structure.mps
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:7b6bea6a-7952-48df-9449-f3f805640b2f(com.mpsbasics.core.structure)">
+  <persistence version="9" />
+  <languages>
+    <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
+  </languages>
+  <imports />
+  <registry />
+</model>
+
diff --git a/code/languages/com.mpsbasics/languages/com.mpsbasics.core/models/com.mpsbasics.core.typesystem.mps b/code/languages/com.mpsbasics/languages/com.mpsbasics.core/models/com.mpsbasics.core.typesystem.mps
new file mode 100644
index 000000000..eab343431
--- /dev/null
+++ b/code/languages/com.mpsbasics/languages/com.mpsbasics.core/models/com.mpsbasics.core.typesystem.mps
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:a3b2ec42-4f9e-4127-b313-01b0b89782b2(com.mpsbasics.core.typesystem)">
+  <persistence version="9" />
+  <languages>
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
+    <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
+  </languages>
+  <imports />
+  <registry />
+</model>
+
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 cf64d359d..1accbce63 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
@@ -97,6 +97,7 @@
     <language slang="l:7a060fae-09e0-4372-be36-6696d6554c0e:com.mbeddr.mpsutil.review.annotation" version="0" />
     <language slang="l:fde86f49-830f-414f-9c22-2a9e300eaba6:com.mpsbasics.jira" version="0" />
     <language slang="l:ece26728-2885-4b26-9f61-67d2821fc361:com.mpsbasics.pdfexporter" version="0" />
+    <language slang="l:6f31bc85-cbcc-4dcf-ada4-35da43e6832c:com.symo.plantuml" version="0" />
     <language slang="l:8ca79d43-eb45-4791-bdd4-0d6130ff895b:de.itemis.mps.editor.diagram.layout" version="0" />
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -127,6 +128,7 @@
     <module reference="7a642ffb-bd05-4e8c-b81a-08fde9a204ba(com.mbeddr.formal.safety.tutorial)" version="0" />
     <module reference="d873c9ba-1199-4310-897d-5fa1a905f179(com.mbeddr.formal.safety.users_guide)" version="0" />
     <module reference="fde86f49-830f-414f-9c22-2a9e300eaba6(com.mpsbasics.jira)" version="0" />
+    <module reference="377bf088-4ffc-48ac-910f-fb1c66ffa60e(com.symo.plantuml.lib)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="7b45fa94-2707-4a1a-9e6a-ce40c4aaf35a(de.itemis.mps.editor.collapsible.runtime)" version="0" />
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_system_models/.model b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_system_models/.model
new file mode 100644
index 000000000..63eb1e818
--- /dev/null
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_system_models/.model
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:05142504-32bf-4275-bd1c-d1c1eb07650d(_010_features._015_system_models)" content="header">
+  <persistence version="9" />
+  <languages>
+    <devkit ref="114acb95-50b2-4e9b-81c6-e0c665740eae(fasten.symo.plantuml)" />
+  </languages>
+  <imports />
+</model>
+
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_system_models/_010_usecase_diagram.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_system_models/_010_usecase_diagram.mpsr
new file mode 100644
index 000000000..060990690
--- /dev/null
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_system_models/_010_usecase_diagram.mpsr
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:05142504-32bf-4275-bd1c-d1c1eb07650d(_010_features._015_system_models)" content="root">
+  <persistence version="9" />
+  <imports />
+  <registry>
+    <language id="6f31bc85-cbcc-4dcf-ada4-35da43e6832c" name="com.symo.plantuml">
+      <concept id="7634549724643897373" name="com.symo.plantuml.structure.AbstractPlantumlLinkBase" flags="ng" index="cxYUr">
+        <property id="1983696557349506347" name="linkType" index="1pv0MD" />
+        <child id="1983696557349285470" name="target" index="1pvUZs" />
+        <child id="1983696557349285469" name="source" index="1pvUZv" />
+      </concept>
+      <concept id="7634549724644205101" name="com.symo.plantuml.structure.UsecaseDiagramLink" flags="ng" index="cyzMF" />
+      <concept id="7634549724642624365" name="com.symo.plantuml.structure.PlantUmlEmptyLine" flags="ng" index="c$xRF" />
+      <concept id="7634549724642636764" name="com.symo.plantuml.structure.PlantUmlSingleLineComment" flags="ng" index="c$yPq">
+        <property id="7634549724642637897" name="comment" index="c$yrf" />
+      </concept>
+      <concept id="7634549724643586715" name="com.symo.plantuml.structure.UsecaseRef" flags="ng" index="cBaKt">
+        <reference id="7634549724643586717" name="usecase" index="cBaKr" />
+      </concept>
+      <concept id="7634549724643560691" name="com.symo.plantuml.structure.ActorRef" flags="ng" index="cBd9P">
+        <reference id="7634549724643560693" name="actor" index="cBd9N" />
+      </concept>
+      <concept id="7647822637848203625" name="com.symo.plantuml.structure.UsecaseDeclaration" flags="ng" index="S09t2" />
+      <concept id="7647822637849066698" name="com.symo.plantuml.structure.ActorDeclaration" flags="ng" index="S3rFx" />
+      <concept id="7647822637844199905" name="com.symo.plantuml.structure.PlantUmlUsecaseDiagram" flags="ng" index="VLBZa" />
+      <concept id="1983696557348555164" name="com.symo.plantuml.structure.StartUmlCommand" flags="ng" index="1pqCwu" />
+      <concept id="1983696557348555132" name="com.symo.plantuml.structure.PlantUmlDiagramBase" flags="ng" index="1pqCzY">
+        <property id="8400506447498256066" name="zoom" index="145Srp" />
+        <property id="1983696557348880118" name="displayStrategy" index="1ptBXO" />
+        <child id="1983696557348555134" name="content" index="1pqCzW" />
+      </concept>
+      <concept id="1983696557348555523" name="com.symo.plantuml.structure.EndUmlCommand" flags="ng" index="1pqCE1" />
+      <concept id="1983696557348533346" name="com.symo.plantuml.structure.PlantUmlRoot" flags="ng" index="1pqNnw">
+        <child id="1983696557348555138" name="content" index="1pqCw0" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="1pqNnw" id="75npNYZvABA">
+    <property role="TrG5h" value="_010_usecase_diagram" />
+    <node concept="c$yPq" id="75npNYZw7b4" role="1pqCw0">
+      <property role="c$yrf" value="example of a usecase diagram" />
+    </node>
+    <node concept="c$xRF" id="75npNYZw7b5" role="1pqCw0" />
+    <node concept="VLBZa" id="75npNYZyqAA" role="1pqCw0">
+      <property role="145Srp" value="100" />
+      <property role="TrG5h" value="Vending Maching" />
+      <property role="1ptBXO" value="1I7wo92WvVO/TEXT_AND_DIAGRAM" />
+      <node concept="1pqCwu" id="75npNYZyqAB" role="1pqCzW" />
+      <node concept="S3rFx" id="75npNYZyqAF" role="1pqCzW">
+        <property role="TrG5h" value="User" />
+      </node>
+      <node concept="S3rFx" id="75npNYZyqAI" role="1pqCzW">
+        <property role="TrG5h" value="Maintenance" />
+      </node>
+      <node concept="S09t2" id="75npNYZyqAL" role="1pqCzW">
+        <property role="TrG5h" value="Buy_Coffee" />
+      </node>
+      <node concept="cyzMF" id="75npNYZyqAO" role="1pqCzW">
+        <property role="1pv0MD" value="7ikA1GKsc8P/ARROW_RIGHT" />
+        <node concept="cBd9P" id="75npNYZyqAQ" role="1pvUZv">
+          <ref role="cBd9N" node="75npNYZyqAF" resolve="User" />
+        </node>
+        <node concept="cBaKt" id="75npNYZyqAR" role="1pvUZs">
+          <ref role="cBaKr" node="75npNYZyqAL" resolve="Buy_Coffee" />
+        </node>
+      </node>
+      <node concept="S09t2" id="75npNYZyqAV" role="1pqCzW">
+        <property role="TrG5h" value="Repair" />
+      </node>
+      <node concept="cyzMF" id="75npNYZyqAS" role="1pqCzW">
+        <property role="1pv0MD" value="7ikA1GKsc8P/ARROW_RIGHT" />
+        <node concept="cBd9P" id="75npNYZyqAT" role="1pvUZv">
+          <ref role="cBd9N" node="75npNYZyqAI" resolve="Maintenance" />
+        </node>
+        <node concept="cBaKt" id="75npNYZyqAU" role="1pvUZs">
+          <ref role="cBaKr" node="75npNYZyqAV" resolve="Repair" />
+        </node>
+      </node>
+      <node concept="S09t2" id="75npNYZyqAX" role="1pqCzW">
+        <property role="TrG5h" value="Start_Machine" />
+      </node>
+      <node concept="cyzMF" id="75npNYZyqB0" role="1pqCzW">
+        <property role="1pv0MD" value="7ikA1GKsc8Q/ARROW_LEFT" />
+        <node concept="cBd9P" id="75npNYZyqB1" role="1pvUZv">
+          <ref role="cBd9N" node="75npNYZyqAF" resolve="User" />
+        </node>
+        <node concept="cBaKt" id="75npNYZyqB2" role="1pvUZs">
+          <ref role="cBaKr" node="75npNYZyqAX" resolve="start" />
+        </node>
+      </node>
+      <node concept="cyzMF" id="75npNYZyqB3" role="1pqCzW">
+        <property role="1pv0MD" value="7ikA1GKsc8P/ARROW_RIGHT" />
+        <node concept="cBd9P" id="75npNYZyqB4" role="1pvUZv">
+          <ref role="cBd9N" node="75npNYZyqAI" resolve="Maintenance" />
+        </node>
+        <node concept="cBaKt" id="75npNYZyqB5" role="1pvUZs">
+          <ref role="cBaKr" node="75npNYZyqAX" resolve="start" />
+        </node>
+      </node>
+      <node concept="S09t2" id="75npNYZyqB7" role="1pqCzW">
+        <property role="TrG5h" value="Pay" />
+      </node>
+      <node concept="cyzMF" id="75npNYZyqBa" role="1pqCzW">
+        <property role="1pv0MD" value="7ikA1GKsc8P/ARROW_RIGHT" />
+        <node concept="cBaKt" id="75npNYZyqBc" role="1pvUZv">
+          <ref role="cBaKr" node="75npNYZyqAL" resolve="Buy_Coffee" />
+        </node>
+        <node concept="cBaKt" id="75npNYZyqBd" role="1pvUZs">
+          <ref role="cBaKr" node="75npNYZyqB7" resolve="Pay" />
+        </node>
+      </node>
+      <node concept="1pqCE1" id="75npNYZyqAD" role="1pqCzW" />
+    </node>
+  </node>
+</model>
+
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_system_models/_020_component_diagram.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_system_models/_020_component_diagram.mpsr
new file mode 100644
index 000000000..5cb3055b9
--- /dev/null
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_system_models/_020_component_diagram.mpsr
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:05142504-32bf-4275-bd1c-d1c1eb07650d(_010_features._015_system_models)" content="root">
+  <persistence version="9" />
+  <imports />
+  <registry>
+    <language id="6f31bc85-cbcc-4dcf-ada4-35da43e6832c" name="com.symo.plantuml">
+      <concept id="7634549724643897373" name="com.symo.plantuml.structure.AbstractPlantumlLinkBase" flags="ng" index="cxYUr">
+        <property id="1983696557349506347" name="linkType" index="1pv0MD" />
+        <child id="1983696557349285470" name="target" index="1pvUZs" />
+        <child id="1983696557349285469" name="source" index="1pvUZv" />
+      </concept>
+      <concept id="7634549724642624365" name="com.symo.plantuml.structure.PlantUmlEmptyLine" flags="ng" index="c$xRF" />
+      <concept id="7634549724642636764" name="com.symo.plantuml.structure.PlantUmlSingleLineComment" flags="ng" index="c$yPq">
+        <property id="7634549724642637897" name="comment" index="c$yrf" />
+      </concept>
+      <concept id="1983696557348555164" name="com.symo.plantuml.structure.StartUmlCommand" flags="ng" index="1pqCwu" />
+      <concept id="1983696557348555132" name="com.symo.plantuml.structure.PlantUmlDiagramBase" flags="ng" index="1pqCzY">
+        <property id="8400506447498256066" name="zoom" index="145Srp" />
+        <property id="1983696557348880118" name="displayStrategy" index="1ptBXO" />
+        <child id="1983696557348555134" name="content" index="1pqCzW" />
+      </concept>
+      <concept id="1983696557348555133" name="com.symo.plantuml.structure.PlantUmlComponentDiagram" flags="ng" index="1pqCzZ" />
+      <concept id="1983696557348555523" name="com.symo.plantuml.structure.EndUmlCommand" flags="ng" index="1pqCE1" />
+      <concept id="1983696557348533346" name="com.symo.plantuml.structure.PlantUmlRoot" flags="ng" index="1pqNnw">
+        <child id="1983696557348555138" name="content" index="1pqCw0" />
+      </concept>
+      <concept id="1983696557349255043" name="com.symo.plantuml.structure.ComponentsChannel" flags="ng" index="1ps3o1" />
+      <concept id="1983696557348896981" name="com.symo.plantuml.structure.ComponentDeclaration" flags="ng" index="1pts5n" />
+      <concept id="1983696557349277305" name="com.symo.plantuml.structure.ComponentRef" flags="ng" index="1pvSZV">
+        <reference id="1983696557349277306" name="component" index="1pvSZS" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="1pqNnw" id="75npNYZyqAq">
+    <property role="TrG5h" value="_020_component_diagram" />
+    <node concept="c$yPq" id="75npNYZyqAr" role="1pqCw0">
+      <property role="c$yrf" value="example of a component diagram" />
+    </node>
+    <node concept="c$xRF" id="75npNYZyqAs" role="1pqCw0" />
+    <node concept="1pqCzZ" id="75npNYZyqAt" role="1pqCw0">
+      <property role="145Srp" value="70" />
+      <property role="TrG5h" value="Sender-Receiver" />
+      <property role="1ptBXO" value="1I7wo92WvVO/TEXT_AND_DIAGRAM" />
+      <node concept="1pqCwu" id="75npNYZyqAu" role="1pqCzW" />
+      <node concept="1pts5n" id="75npNYZyqAv" role="1pqCzW">
+        <property role="TrG5h" value="Camera" />
+      </node>
+      <node concept="1pts5n" id="75npNYZyqAw" role="1pqCzW">
+        <property role="TrG5h" value="Camera_Objects_Detection" />
+      </node>
+      <node concept="1ps3o1" id="75npNYZyqAx" role="1pqCzW">
+        <property role="1pv0MD" value="7ikA1GKsc8P/ARROW_RIGHT" />
+        <node concept="1pvSZV" id="75npNYZyqAy" role="1pvUZv">
+          <ref role="1pvSZS" node="75npNYZyqAv" resolve="Sender" />
+        </node>
+        <node concept="1pvSZV" id="75npNYZyqAz" role="1pvUZs">
+          <ref role="1pvSZS" node="75npNYZyqAw" resolve="Receiver" />
+        </node>
+      </node>
+      <node concept="1pts5n" id="75npNYZyqBe" role="1pqCzW">
+        <property role="TrG5h" value="Radar_Left" />
+      </node>
+      <node concept="1pts5n" id="75npNYZyqBf" role="1pqCzW">
+        <property role="TrG5h" value="Radar_Right" />
+      </node>
+      <node concept="1pts5n" id="75npNYZyqBj" role="1pqCzW">
+        <property role="TrG5h" value="Radar_Objects_Detection" />
+      </node>
+      <node concept="1ps3o1" id="75npNYZyqBm" role="1pqCzW">
+        <property role="1pv0MD" value="7ikA1GKsc8P/ARROW_RIGHT" />
+        <node concept="1pvSZV" id="75npNYZyqBo" role="1pvUZv">
+          <ref role="1pvSZS" node="75npNYZyqBe" resolve="Radar_Left" />
+        </node>
+        <node concept="1pvSZV" id="75npNYZyqBp" role="1pvUZs">
+          <ref role="1pvSZS" node="75npNYZyqBj" resolve="Radar_Objects_Detection" />
+        </node>
+      </node>
+      <node concept="1ps3o1" id="75npNYZyqBq" role="1pqCzW">
+        <property role="1pv0MD" value="7ikA1GKsc8P/ARROW_RIGHT" />
+        <node concept="1pvSZV" id="75npNYZyqBr" role="1pvUZv">
+          <ref role="1pvSZS" node="75npNYZyqBf" resolve="Radar_Right" />
+        </node>
+        <node concept="1pvSZV" id="75npNYZyqBs" role="1pvUZs">
+          <ref role="1pvSZS" node="75npNYZyqBj" resolve="Radar_Objects_Detection" />
+        </node>
+      </node>
+      <node concept="1pts5n" id="75npNYZyqBu" role="1pqCzW">
+        <property role="TrG5h" value="Sensors_Fusion" />
+      </node>
+      <node concept="1ps3o1" id="75npNYZyqBx" role="1pqCzW">
+        <property role="1pv0MD" value="7ikA1GKsc8P/ARROW_RIGHT" />
+        <node concept="1pvSZV" id="75npNYZyqBz" role="1pvUZv">
+          <ref role="1pvSZS" node="75npNYZyqAw" resolve="Camera_Objects_Detection" />
+        </node>
+        <node concept="1pvSZV" id="75npNYZyqB$" role="1pvUZs">
+          <ref role="1pvSZS" node="75npNYZyqBu" resolve="Sensors_Fusion" />
+        </node>
+      </node>
+      <node concept="1ps3o1" id="75npNYZyqB_" role="1pqCzW">
+        <property role="1pv0MD" value="7ikA1GKsc8P/ARROW_RIGHT" />
+        <node concept="1pvSZV" id="75npNYZyqBA" role="1pvUZv">
+          <ref role="1pvSZS" node="75npNYZyqBj" resolve="Radar_Objects_Detection" />
+        </node>
+        <node concept="1pvSZV" id="75npNYZyqBB" role="1pvUZs">
+          <ref role="1pvSZS" node="75npNYZyqBu" resolve="Sensors_Fusion" />
+        </node>
+      </node>
+      <node concept="1pqCE1" id="75npNYZyqA$" role="1pqCzW" />
+    </node>
+  </node>
+</model>
+