diff --git a/code/applications/HeartBleed/_spreferences/CodeReviewPreferences/module.msd b/code/applications/HeartBleed/_spreferences/CodeReviewPreferences/module.msd
index 10b3318ba7f..9ddd0a036a3 100644
--- a/code/applications/HeartBleed/_spreferences/CodeReviewPreferences/module.msd
+++ b/code/applications/HeartBleed/_spreferences/CodeReviewPreferences/module.msd
@@ -24,6 +24,7 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/code/applications/IntegratedCExample/_spreferences/CodeReviewPreferences/module.msd b/code/applications/IntegratedCExample/_spreferences/CodeReviewPreferences/module.msd
index 3974dcc30f1..3c0df2e9968 100644
--- a/code/applications/IntegratedCExample/_spreferences/CodeReviewPreferences/module.msd
+++ b/code/applications/IntegratedCExample/_spreferences/CodeReviewPreferences/module.msd
@@ -24,6 +24,7 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/code/applications/Pacemaker/_spreferences/CodeReviewPreferences/module.msd b/code/applications/Pacemaker/_spreferences/CodeReviewPreferences/module.msd
index 2c487f572db..ec8d33b5a62 100644
--- a/code/applications/Pacemaker/_spreferences/CodeReviewPreferences/module.msd
+++ b/code/applications/Pacemaker/_spreferences/CodeReviewPreferences/module.msd
@@ -24,6 +24,7 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/code/applications/com.mbeddr.build-examples/_spreferences/CodeReviewPreferences/module.msd b/code/applications/com.mbeddr.build-examples/_spreferences/CodeReviewPreferences/module.msd
index 59f2b403c48..7fbd63657e2 100644
--- a/code/applications/com.mbeddr.build-examples/_spreferences/CodeReviewPreferences/module.msd
+++ b/code/applications/com.mbeddr.build-examples/_spreferences/CodeReviewPreferences/module.msd
@@ -24,6 +24,7 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/code/applications/com.mbeddr.documentation/_spreferences/CodeReviewPreferences/module.msd b/code/applications/com.mbeddr.documentation/_spreferences/CodeReviewPreferences/module.msd
index aeca9ae1eb1..0b973940033 100644
--- a/code/applications/com.mbeddr.documentation/_spreferences/CodeReviewPreferences/module.msd
+++ b/code/applications/com.mbeddr.documentation/_spreferences/CodeReviewPreferences/module.msd
@@ -24,6 +24,7 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/code/applications/com.mbeddr.documentation/solutions/com.mbeddr.mpsutil.interpreter.documentation/com.mbeddr.mpsutil.interpreter.documentation.msd b/code/applications/com.mbeddr.documentation/solutions/com.mbeddr.mpsutil.interpreter.documentation/com.mbeddr.mpsutil.interpreter.documentation.msd
index 4651fd9f0b1..da983c6c937 100644
--- a/code/applications/com.mbeddr.documentation/solutions/com.mbeddr.mpsutil.interpreter.documentation/com.mbeddr.mpsutil.interpreter.documentation.msd
+++ b/code/applications/com.mbeddr.documentation/solutions/com.mbeddr.mpsutil.interpreter.documentation/com.mbeddr.mpsutil.interpreter.documentation.msd
@@ -42,7 +42,7 @@
     <language slang="l:1c5b7d51-0ef3-4332-af36-874466950878:com.mbeddr.doc.expressions" version="0" />
     <language slang="l:f44f6b9a-bf30-4f73-866e-fac17c177409:com.mbeddr.doc.gen_latex" version="0" />
     <language slang="l:2dec0852-3a21-4c4e-a68c-b05236cc37f2:com.mbeddr.doc.gen_xhtml" version="1" />
-    <language slang="l:e06345c7-da82-4f8b-bd44-1425fe158640:com.mbeddr.doc.meta" version="0" />
+    <language slang="l:e06345c7-da82-4f8b-bd44-1425fe158640:com.mbeddr.doc.meta" version="1" />
     <language slang="l:5344b781-2242-4d23-be90-673ee10bea46:com.mbeddr.doc.qa" version="0" />
     <language slang="l:d7145000-936a-47e8-95a5-71f220e623f9:com.mbeddr.doc.self" version="0" />
     <language slang="l:c61970b4-87fb-4429-8a3a-c87719f000a3:com.mbeddr.doc.terms" version="0" />
diff --git a/code/applications/com.mbeddr.documentation/solutions/com.mbeddr.mpsutil.interpreter.documentation/models/com/mbeddr/mpsutil/interpreter/documentation/docs.mps b/code/applications/com.mbeddr.documentation/solutions/com.mbeddr.mpsutil.interpreter.documentation/models/com/mbeddr/mpsutil/interpreter/documentation/docs.mps
index 347242b10eb..836505f1782 100644
--- a/code/applications/com.mbeddr.documentation/solutions/com.mbeddr.mpsutil.interpreter.documentation/models/com/mbeddr/mpsutil/interpreter/documentation/docs.mps
+++ b/code/applications/com.mbeddr.documentation/solutions/com.mbeddr.mpsutil.interpreter.documentation/models/com/mbeddr/mpsutil/interpreter/documentation/docs.mps
@@ -5,7 +5,7 @@
     <use id="1c897ba5-9d43-4035-ac7f-0306495743ac" name="com.mbeddr.mpsutil.interpreter.test" version="0" />
     <use id="47f075a6-558e-4640-a606-7ce0236c8023" name="com.mbeddr.mpsutil.interpreter" version="1" />
     <use id="390de4af-0c8d-4716-8dec-3d05ca751b28" name="com.mbeddr.core.cinterpreter" version="0" />
-    <use id="e06345c7-da82-4f8b-bd44-1425fe158640" name="com.mbeddr.doc.meta" version="0" />
+    <use id="e06345c7-da82-4f8b-bd44-1425fe158640" name="com.mbeddr.doc.meta" version="1" />
     <use id="86ef8290-12bb-4ca7-947f-093788f263a9" name="jetbrains.mps.lang.project" version="0" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="2374bc90-7e37-41f1-a9c4-c2e35194c36a" name="com.mbeddr.doc" version="4" />
@@ -37,13 +37,7 @@
   <registry>
     <language id="2dec0852-3a21-4c4e-a68c-b05236cc37f2" name="com.mbeddr.doc.gen_xhtml">
       <concept id="3350625596580275037" name="com.mbeddr.doc.gen_xhtml.structure.HTMLRenderer" flags="ng" index="1_07dB" />
-      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLDummyRenderer" flags="ng" index="1TaS0h" />
-    </language>
-    <language id="86ef8290-12bb-4ca7-947f-093788f263a9" name="jetbrains.mps.lang.project">
-      <concept id="1855399583446016268" name="jetbrains.mps.lang.project.structure.ModuleReference" flags="ng" index="A2Dkr">
-        <property id="1855399583446016270" name="qualifiedName" index="A2Dkp" />
-        <property id="1855399583446016269" name="uuid" index="A2Dkq" />
-      </concept>
+      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLNoOutputRenderer" flags="ng" index="1TaS0h" />
     </language>
     <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext">
       <concept id="2557074442922380897" name="de.slisson.mps.richtext.structure.Text" flags="ng" index="19SGf9">
@@ -148,6 +142,12 @@
         <property id="2711621784026951428" name="pointOnlyToExistingFile" index="1RwFax" />
       </concept>
     </language>
+    <language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
+      <concept id="361130699826193249" name="jetbrains.mps.lang.modelapi.structure.ModulePointer" flags="ng" index="1dCxOk">
+        <property id="1863527487546097500" name="moduleId" index="1XweGW" />
+        <property id="1863527487545993577" name="moduleName" index="1XxBO9" />
+      </concept>
+    </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
@@ -156,7 +156,7 @@
     <language id="e06345c7-da82-4f8b-bd44-1425fe158640" name="com.mbeddr.doc.meta">
       <concept id="4411878964391860302" name="com.mbeddr.doc.meta.structure.SolutionRefWord" flags="ng" index="XCBN5" />
       <concept id="4411878964391805161" name="com.mbeddr.doc.meta.structure.AbstractModuleRefWord" flags="ng" index="XFqhy">
-        <child id="4411878964391805166" name="moduleRef" index="XFqh_" />
+        <child id="8480291644168929007" name="identity" index="2nPJaY" />
       </concept>
       <concept id="8408742697223012410" name="com.mbeddr.doc.meta.structure.LanguageRefWord" flags="ng" index="3R4DFk" />
     </language>
@@ -181,9 +181,9 @@
               <property role="19SUeA" value="The " />
             </node>
             <node concept="3R4DFk" id="3OU98G0AHDQ" role="19SJt6">
-              <node concept="A2Dkr" id="3OU98G0AHDU" role="XFqh_">
-                <property role="A2Dkp" value="com.mbeddr.mpsutil.interpreter" />
-                <property role="A2Dkq" value="47f075a6-558e-4640-a606-7ce0236c8023" />
+              <node concept="1dCxOk" id="4FginuvUePu" role="2nPJaY">
+                <property role="1XweGW" value="47f075a6-558e-4640-a606-7ce0236c8023" />
+                <property role="1XxBO9" value="com.mbeddr.mpsutil.interpreter" />
               </node>
             </node>
             <node concept="19SUe$" id="3OU98G0AHDP" role="19SJt6">
@@ -270,9 +270,9 @@
                   <property role="19SUeA" value="The " />
                 </node>
                 <node concept="XCBN5" id="1T7O9iWSE4I" role="19SJt6">
-                  <node concept="A2Dkr" id="1T7O9iWSHRt" role="XFqh_">
-                    <property role="A2Dkp" value="com.mbeddr.mpsutil.interpreter.rt" />
-                    <property role="A2Dkq" value="735f86bc-17fb-4d1c-a664-82c2b8e8a34e" />
+                  <node concept="1dCxOk" id="4FginuvUePy" role="2nPJaY">
+                    <property role="1XweGW" value="735f86bc-17fb-4d1c-a664-82c2b8e8a34e" />
+                    <property role="1XxBO9" value="com.mbeddr.mpsutil.interpreter.rt" />
                   </node>
                 </node>
                 <node concept="19SUe$" id="1T7O9iWSE4J" role="19SJt6">
@@ -288,9 +288,9 @@
                   <property role="19SUeA" value="The " />
                 </node>
                 <node concept="3R4DFk" id="1T7O9iWSJey" role="19SJt6">
-                  <node concept="A2Dkr" id="1T7O9iWSJeB" role="XFqh_">
-                    <property role="A2Dkp" value="com.mbeddr.mpsutil.interpreter.test" />
-                    <property role="A2Dkq" value="1c897ba5-9d43-4035-ac7f-0306495743ac" />
+                  <node concept="1dCxOk" id="4FginuvUePv" role="2nPJaY">
+                    <property role="1XweGW" value="1c897ba5-9d43-4035-ac7f-0306495743ac" />
+                    <property role="1XxBO9" value="com.mbeddr.mpsutil.interpreter.test" />
                   </node>
                 </node>
                 <node concept="19SUe$" id="1T7O9iWSJez" role="19SJt6">
@@ -502,9 +502,9 @@
             <property role="19SUeA" value=", a Java class based on the " />
           </node>
           <node concept="XCBN5" id="1d83w5bFauk" role="19SJt6">
-            <node concept="A2Dkr" id="1d83w5bFfzt" role="XFqh_">
-              <property role="A2Dkp" value="com.mbeddr.mpsutil.interpreter.rt" />
-              <property role="A2Dkq" value="735f86bc-17fb-4d1c-a664-82c2b8e8a34e" />
+            <node concept="1dCxOk" id="4FginuvUePz" role="2nPJaY">
+              <property role="1XweGW" value="735f86bc-17fb-4d1c-a664-82c2b8e8a34e" />
+              <property role="1XxBO9" value="com.mbeddr.mpsutil.interpreter.rt" />
             </node>
           </node>
           <node concept="19SUe$" id="1d83w5bFaul" role="19SJt6">
@@ -2559,18 +2559,18 @@
             <property role="19SUeA" value="The " />
           </node>
           <node concept="3R4DFk" id="1Y3rEQ3p9VK" role="19SJt6">
-            <node concept="A2Dkr" id="1Y3rEQ3p9WS" role="XFqh_">
-              <property role="A2Dkp" value="com.mbeddr.mpsutil.interpreter.test" />
-              <property role="A2Dkq" value="1c897ba5-9d43-4035-ac7f-0306495743ac" />
+            <node concept="1dCxOk" id="4FginuvUePw" role="2nPJaY">
+              <property role="1XweGW" value="1c897ba5-9d43-4035-ac7f-0306495743ac" />
+              <property role="1XxBO9" value="com.mbeddr.mpsutil.interpreter.test" />
             </node>
           </node>
           <node concept="19SUe$" id="1Y3rEQ3p9VL" role="19SJt6">
             <property role="19SUeA" value=" language provides the basis for custom test languages for the Interpreted Language. An example for a custom test language would be " />
           </node>
           <node concept="3R4DFk" id="1Y3rEQ3p9WU" role="19SJt6">
-            <node concept="A2Dkr" id="1Y3rEQ3p9X2" role="XFqh_">
-              <property role="A2Dkp" value="com.mbeddr.core.cinterpreter" />
-              <property role="A2Dkq" value="390de4af-0c8d-4716-8dec-3d05ca751b28" />
+            <node concept="1dCxOk" id="4FginuvUePx" role="2nPJaY">
+              <property role="1XweGW" value="390de4af-0c8d-4716-8dec-3d05ca751b28" />
+              <property role="1XxBO9" value="com.mbeddr.core.cinterpreter" />
             </node>
           </node>
           <node concept="19SUe$" id="1Y3rEQ3p9WV" role="19SJt6">
diff --git a/code/applications/com.mbeddr.documentation/solutions/com.mbeddr.mpsutil.interpreter.documentation/models/com/mbeddr/mpsutil/interpreter/documentation/support.mps b/code/applications/com.mbeddr.documentation/solutions/com.mbeddr.mpsutil.interpreter.documentation/models/com/mbeddr/mpsutil/interpreter/documentation/support.mps
index 3356d3f85fc..22fed918677 100644
--- a/code/applications/com.mbeddr.documentation/solutions/com.mbeddr.mpsutil.interpreter.documentation/models/com/mbeddr/mpsutil/interpreter/documentation/support.mps
+++ b/code/applications/com.mbeddr.documentation/solutions/com.mbeddr.mpsutil.interpreter.documentation/models/com/mbeddr/mpsutil/interpreter/documentation/support.mps
@@ -6,7 +6,7 @@
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="2374bc90-7e37-41f1-a9c4-c2e35194c36a" name="com.mbeddr.doc" version="4" />
     <use id="1c5b7d51-0ef3-4332-af36-874466950878" name="com.mbeddr.doc.expressions" version="0" />
-    <use id="e06345c7-da82-4f8b-bd44-1425fe158640" name="com.mbeddr.doc.meta" version="0" />
+    <use id="e06345c7-da82-4f8b-bd44-1425fe158640" name="com.mbeddr.doc.meta" version="1" />
     <use id="5344b781-2242-4d23-be90-673ee10bea46" name="com.mbeddr.doc.qa" version="0" />
     <use id="d7145000-936a-47e8-95a5-71f220e623f9" name="com.mbeddr.doc.self" version="0" />
     <use id="c61970b4-87fb-4429-8a3a-c87719f000a3" name="com.mbeddr.doc.terms" version="0" />
diff --git a/code/applications/com.mbeddr.embedded/_spreferences/CodeReviewPreferences/module.msd b/code/applications/com.mbeddr.embedded/_spreferences/CodeReviewPreferences/module.msd
index 82522d9cfd3..b7f26b21539 100644
--- a/code/applications/com.mbeddr.embedded/_spreferences/CodeReviewPreferences/module.msd
+++ b/code/applications/com.mbeddr.embedded/_spreferences/CodeReviewPreferences/module.msd
@@ -24,6 +24,7 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/code/applications/tutorial-dsls-extensions/_spreferences/CodeReviewPreferences/module.msd b/code/applications/tutorial-dsls-extensions/_spreferences/CodeReviewPreferences/module.msd
index 2efe0e7a00c..aa55a701742 100644
--- a/code/applications/tutorial-dsls-extensions/_spreferences/CodeReviewPreferences/module.msd
+++ b/code/applications/tutorial-dsls-extensions/_spreferences/CodeReviewPreferences/module.msd
@@ -24,6 +24,7 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.extreqref/mbeddr.tutorial.extreqref.mpl b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.extreqref/mbeddr.tutorial.extreqref.mpl
index f902c2d6102..05a4a7f82ed 100644
--- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.extreqref/mbeddr.tutorial.extreqref.mpl
+++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.extreqref/mbeddr.tutorial.extreqref.mpl
@@ -38,6 +38,7 @@
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
         <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:4930e34b-b776-4ccb-b2ff-c6f31789e126:mbeddr.tutorial.extreqref" version="0" />
       </languageVersions>
@@ -68,8 +69,12 @@
         <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
         <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
         <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+        <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
         <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
+        <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+        <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
+        <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="4930e34b-b776-4ccb-b2ff-c6f31789e126(mbeddr.tutorial.extreqref)" version="0" />
         <module reference="21c37609-af7b-42be-b233-a3cfdf5a20e3(mbeddr.tutorial.extreqref#806361095879876987)" version="0" />
@@ -143,9 +148,13 @@
     <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
     <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+    <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
+    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
+    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="4930e34b-b776-4ccb-b2ff-c6f31789e126(mbeddr.tutorial.extreqref)" version="0" />
   </dependencyVersions>
diff --git a/code/applications/tutorial-dsls-extensions/languages/metadata/metadata.mpl b/code/applications/tutorial-dsls-extensions/languages/metadata/metadata.mpl
index 9d1042853bb..4bf8d96f05b 100644
--- a/code/applications/tutorial-dsls-extensions/languages/metadata/metadata.mpl
+++ b/code/applications/tutorial-dsls-extensions/languages/metadata/metadata.mpl
@@ -56,8 +56,12 @@
         <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
         <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
         <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+        <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
         <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
+        <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+        <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
+        <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7fc59e55-0f30-4694-b8e3-d334e472c924(mbeddr.tutorial.metadata)" version="0" />
         <module reference="d2a1d480-ae8b-4f62-a006-70cfebe511d6(mbeddr.tutorial.metadata#1373401575434711868)" version="0" />
diff --git a/code/applications/tutorial-dsls-extensions/languages/osconfig/osconfig.mpl b/code/applications/tutorial-dsls-extensions/languages/osconfig/osconfig.mpl
index 506c0dfc5c5..f89eb7f2f06 100644
--- a/code/applications/tutorial-dsls-extensions/languages/osconfig/osconfig.mpl
+++ b/code/applications/tutorial-dsls-extensions/languages/osconfig/osconfig.mpl
@@ -71,9 +71,13 @@
     <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
     <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+    <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
+    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
+    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="a577a05d-67ad-41db-9547-6e5f0730b85d(mbeddr.tutorial.osconfig)" version="0" />
   </dependencyVersions>
diff --git a/code/applications/tutorial-dsls-extensions/solutions/lib/com.mbeddr.ext.exceptionhandling/com.mbeddr.ext.exceptionhandling.library.msd b/code/applications/tutorial-dsls-extensions/solutions/lib/com.mbeddr.ext.exceptionhandling/com.mbeddr.ext.exceptionhandling.library.msd
index ed8796175cd..aaacbf6be58 100644
--- a/code/applications/tutorial-dsls-extensions/solutions/lib/com.mbeddr.ext.exceptionhandling/com.mbeddr.ext.exceptionhandling.library.msd
+++ b/code/applications/tutorial-dsls-extensions/solutions/lib/com.mbeddr.ext.exceptionhandling/com.mbeddr.ext.exceptionhandling.library.msd
@@ -29,7 +29,7 @@
     <language slang="l:efda956e-491e-4f00-ba14-36af2f213ecf:com.mbeddr.core.udt" version="5" />
     <language slang="l:06d68b77-b699-4918-83b8-857e63787800:com.mbeddr.core.unittest" version="4" />
     <language slang="l:2693fc71-9b0e-4b05-ab13-f57227d675f2:com.mbeddr.core.util" version="0" />
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />
     <language slang="l:1c897ba5-9d43-4035-ac7f-0306495743ac:com.mbeddr.mpsutil.interpreter.test" version="0" />
     <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
diff --git a/code/applications/tutorial/_spreferences/CodeReviewPreferences/module.msd b/code/applications/tutorial/_spreferences/CodeReviewPreferences/module.msd
index 1ec212a4eac..f3b0fab9106 100644
--- a/code/applications/tutorial/_spreferences/CodeReviewPreferences/module.msd
+++ b/code/applications/tutorial/_spreferences/CodeReviewPreferences/module.msd
@@ -24,6 +24,7 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.buildProject/com.mbeddr.tutorial.buildProject.msd b/code/applications/tutorial/solutions/com.mbeddr.tutorial.buildProject/com.mbeddr.tutorial.buildProject.msd
index d8e24025836..dfd32fd3bba 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.buildProject/com.mbeddr.tutorial.buildProject.msd
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.buildProject/com.mbeddr.tutorial.buildProject.msd
@@ -38,6 +38,7 @@
     <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/C_Units.mpsr b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/C_Units.mpsr
index dd800bedb21..f4c94cb50c1 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/C_Units.mpsr
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/C_Units.mpsr
@@ -38,7 +38,7 @@
         <property id="126932837435370851" name="name" index="Wq1Bt" />
       </concept>
       <concept id="4457500422381571986" name="com.mbeddr.doc.structure.CodeFormattedText" flags="ng" index="1jUjqm" />
-      <concept id="5185579450379273118" name="com.mbeddr.doc.structure.TextParHeader" flags="ng" index="1xAIan">
+      <concept id="5185579450379273118" name="com.mbeddr.doc.structure.TextParagraphHeader" flags="ng" index="1xAIan">
         <property id="5185579450379273119" name="text" index="1xAIam" />
       </concept>
       <concept id="6955693250238922820" name="com.mbeddr.doc.structure.AbstractModelContentParagraph" flags="ng" index="3z_lpG">
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/UserGuideExport.mpsr b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/UserGuideExport.mpsr
index 2521bfc6dc8..891e97bb3d8 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/UserGuideExport.mpsr
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/UserGuideExport.mpsr
@@ -6,7 +6,7 @@
   </imports>
   <registry>
     <language id="2dec0852-3a21-4c4e-a68c-b05236cc37f2" name="com.mbeddr.doc.gen_xhtml">
-      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLDummyRenderer" flags="ng" index="1TaS0h" />
+      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLNoOutputRenderer" flags="ng" index="1TaS0h" />
     </language>
     <language id="2374bc90-7e37-41f1-a9c4-c2e35194c36a" name="com.mbeddr.doc">
       <concept id="6386504476136554612" name="com.mbeddr.doc.structure.PathMapping" flags="ng" index="2SbEIf">
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/_main.mps b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/_main.mps
index 5072a0ded15..92b25dbc046 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/_main.mps
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/_main.mps
@@ -21,7 +21,7 @@
   <registry>
     <language id="2dec0852-3a21-4c4e-a68c-b05236cc37f2" name="com.mbeddr.doc.gen_xhtml">
       <concept id="3350625596580275037" name="com.mbeddr.doc.gen_xhtml.structure.HTMLRenderer" flags="ng" index="1_07dB" />
-      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLDummyRenderer" flags="ng" index="1TaS0h" />
+      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLNoOutputRenderer" flags="ng" index="1TaS0h" />
     </language>
     <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext">
       <concept id="2557074442922380897" name="de.slisson.mps.richtext.structure.Text" flags="ng" index="19SGf9">
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/analyses.mps b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/analyses.mps
index 0a903030c64..c9dfac05914 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/analyses.mps
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/analyses.mps
@@ -62,7 +62,7 @@
       <concept id="4208238404723595132" name="com.mbeddr.doc.structure.UrlFormattedText" flags="ng" index="1hOBRO" />
       <concept id="4457500422381571986" name="com.mbeddr.doc.structure.CodeFormattedText" flags="ng" index="1jUjqm" />
       <concept id="4208238404730191274" name="com.mbeddr.doc.structure.Chapter" flags="ng" index="1mvXsy" />
-      <concept id="5185579450379273118" name="com.mbeddr.doc.structure.TextParHeader" flags="ng" index="1xAIan">
+      <concept id="5185579450379273118" name="com.mbeddr.doc.structure.TextParagraphHeader" flags="ng" index="1xAIan">
         <property id="5185579450379273119" name="text" index="1xAIam" />
       </concept>
       <concept id="6955693250238922827" name="com.mbeddr.doc.structure.ModelContentAsImageParagraph" flags="ng" index="3z_lpz">
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/concepts.mps b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/concepts.mps
index c4b3087cc8b..580de908561 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/concepts.mps
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/concepts.mps
@@ -50,7 +50,7 @@
       <concept id="4208238404723595132" name="com.mbeddr.doc.structure.UrlFormattedText" flags="ng" index="1hOBRO" />
       <concept id="4457500422381571986" name="com.mbeddr.doc.structure.CodeFormattedText" flags="ng" index="1jUjqm" />
       <concept id="4208238404730191274" name="com.mbeddr.doc.structure.Chapter" flags="ng" index="1mvXsy" />
-      <concept id="5185579450379273118" name="com.mbeddr.doc.structure.TextParHeader" flags="ng" index="1xAIan">
+      <concept id="5185579450379273118" name="com.mbeddr.doc.structure.TextParagraphHeader" flags="ng" index="1xAIan">
         <property id="5185579450379273119" name="text" index="1xAIam" />
       </concept>
       <concept id="3350625596580225385" name="com.mbeddr.doc.structure.DocumentRef" flags="ng" index="1_0j5j">
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/ctooling.mps b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/ctooling.mps
index cfb12e42538..db0e0e25a0c 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/ctooling.mps
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/ctooling.mps
@@ -83,7 +83,7 @@
       <concept id="4208238404723595132" name="com.mbeddr.doc.structure.UrlFormattedText" flags="ng" index="1hOBRO" />
       <concept id="4457500422381571986" name="com.mbeddr.doc.structure.CodeFormattedText" flags="ng" index="1jUjqm" />
       <concept id="4208238404730191274" name="com.mbeddr.doc.structure.Chapter" flags="ng" index="1mvXsy" />
-      <concept id="5185579450379273118" name="com.mbeddr.doc.structure.TextParHeader" flags="ng" index="1xAIan">
+      <concept id="5185579450379273118" name="com.mbeddr.doc.structure.TextParagraphHeader" flags="ng" index="1xAIan">
         <property id="5185579450379273119" name="text" index="1xAIam" />
       </concept>
       <concept id="6955693250238922827" name="com.mbeddr.doc.structure.ModelContentAsImageParagraph" flags="ng" index="3z_lpz">
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/fundamentals.mps b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/fundamentals.mps
index 606a652e90f..4a7d2c3a19e 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/fundamentals.mps
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/fundamentals.mps
@@ -75,7 +75,7 @@
       <concept id="5185579450379471862" name="com.mbeddr.doc.structure.StringTableCell" flags="ng" index="1xAuFZ">
         <property id="5185579450379471864" name="text" index="1xAuFL" />
       </concept>
-      <concept id="5185579450379273118" name="com.mbeddr.doc.structure.TextParHeader" flags="ng" index="1xAIan">
+      <concept id="5185579450379273118" name="com.mbeddr.doc.structure.TextParagraphHeader" flags="ng" index="1xAIan">
         <property id="5185579450379273119" name="text" index="1xAIam" />
       </concept>
       <concept id="3350625596580225385" name="com.mbeddr.doc.structure.DocumentRef" flags="ng" index="1_0j5j">
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/generateCode.mps b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/generateCode.mps
index ba0abe9ba9b..bf3c3c34b99 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/generateCode.mps
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/generateCode.mps
@@ -29,7 +29,7 @@
       </concept>
       <concept id="4457500422381571986" name="com.mbeddr.doc.structure.CodeFormattedText" flags="ng" index="1jUjqm" />
       <concept id="4208238404730191274" name="com.mbeddr.doc.structure.Chapter" flags="ng" index="1mvXsy" />
-      <concept id="5185579450379273118" name="com.mbeddr.doc.structure.TextParHeader" flags="ng" index="1xAIan">
+      <concept id="5185579450379273118" name="com.mbeddr.doc.structure.TextParagraphHeader" flags="ng" index="1xAIan">
         <property id="5185579450379273119" name="text" index="1xAIam" />
       </concept>
       <concept id="3350625596580225385" name="com.mbeddr.doc.structure.DocumentRef" flags="ng" index="1_0j5j">
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/mbeddrCvsC99.mps b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/mbeddrCvsC99.mps
index b0b53b479ed..20d76d66384 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/mbeddrCvsC99.mps
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/mbeddrCvsC99.mps
@@ -82,7 +82,7 @@
       <concept id="5185579450379471862" name="com.mbeddr.doc.structure.StringTableCell" flags="ng" index="1xAuFZ">
         <property id="5185579450379471864" name="text" index="1xAuFL" />
       </concept>
-      <concept id="5185579450379273118" name="com.mbeddr.doc.structure.TextParHeader" flags="ng" index="1xAIan">
+      <concept id="5185579450379273118" name="com.mbeddr.doc.structure.TextParagraphHeader" flags="ng" index="1xAIan">
         <property id="5185579450379273119" name="text" index="1xAIam" />
       </concept>
       <concept id="6955693250238922820" name="com.mbeddr.doc.structure.AbstractModelContentParagraph" flags="ng" index="3z_lpG">
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/processSupport.mps b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/processSupport.mps
index 663dbcc92ea..28a265b9449 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/processSupport.mps
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/processSupport.mps
@@ -92,7 +92,7 @@
       <concept id="4208238404723595132" name="com.mbeddr.doc.structure.UrlFormattedText" flags="ng" index="1hOBRO" />
       <concept id="4457500422381571986" name="com.mbeddr.doc.structure.CodeFormattedText" flags="ng" index="1jUjqm" />
       <concept id="4208238404730191274" name="com.mbeddr.doc.structure.Chapter" flags="ng" index="1mvXsy" />
-      <concept id="5185579450379273118" name="com.mbeddr.doc.structure.TextParHeader" flags="ng" index="1xAIan">
+      <concept id="5185579450379273118" name="com.mbeddr.doc.structure.TextParagraphHeader" flags="ng" index="1xAIan">
         <property id="5185579450379273119" name="text" index="1xAIam" />
       </concept>
       <concept id="6955693250238922827" name="com.mbeddr.doc.structure.ModelContentAsImageParagraph" flags="ng" index="3z_lpz">
diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/com.mbeddr.tutorial.startup.msd b/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/com.mbeddr.tutorial.startup.msd
index 314c9c4f15d..f92dd7c23da 100644
--- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/com.mbeddr.tutorial.startup.msd
+++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/com.mbeddr.tutorial.startup.msd
@@ -74,9 +74,13 @@
     <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
     <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+    <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
     <module reference="982eb8df-2c96-4bd7-9963-11712ea622e5(jetbrains.mps.lang.resources)" version="0" />
+    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
+    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/code/applications/tutorial/solutions/mbeddr.tutorial.main/mbeddr.tutorial.main.msd b/code/applications/tutorial/solutions/mbeddr.tutorial.main/mbeddr.tutorial.main.msd
index 7a18963947e..f03ba854624 100644
--- a/code/applications/tutorial/solutions/mbeddr.tutorial.main/mbeddr.tutorial.main.msd
+++ b/code/applications/tutorial/solutions/mbeddr.tutorial.main/mbeddr.tutorial.main.msd
@@ -78,7 +78,6 @@
     <language slang="l:564e97d6-8fb7-41f5-bfc1-c7ed376efd62:com.mbeddr.ext.statemachines" version="1" />
     <language slang="l:0d04a6cc-773e-4069-b9b0-11884b2ff1c8:com.mbeddr.ext.units" version="1" />
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
-    <language slang="l:ca9e3cd7-a4a7-4d94-943e-79c063754879:com.mbeddr.mpsutil.favourites" version="0" />
     <language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />
     <language slang="l:1c897ba5-9d43-4035-ac7f-0306495743ac:com.mbeddr.mpsutil.interpreter.test" version="0" />
     <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
@@ -87,7 +86,7 @@
     <language slang="l:c788b046-2019-4656-8b60-8bb9bbb177b5:com.mbeddr.mpsutil.review" version="0" />
     <language slang="l:7a060fae-09e0-4372-be36-6696d6554c0e:com.mbeddr.mpsutil.review.annotation" version="0" />
     <language slang="l:c1c2a88a-323c-4605-a37d-9ab77a2ccbd2:com.mbeddr.mpsutil.suppresswarning" version="0" />
-    <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="0" />
+    <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="1" />
     <language slang="l:8ca79d43-eb45-4791-bdd4-0d6130ff895b:de.itemis.mps.editor.diagram.layout" version="0" />
     <language slang="l:21063c66-85ba-4e98-839b-036445b17ae2:de.itemis.mps.editor.layout" version="0" />
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
diff --git a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/concurrency.mps b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/concurrency.mps
index b6e3353a574..7f5549796d7 100644
--- a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/concurrency.mps
+++ b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/concurrency.mps
@@ -4,7 +4,6 @@
   <languages>
     <use id="0d04a6cc-773e-4069-b9b0-11884b2ff1c8" name="com.mbeddr.ext.units" version="-1" />
     <use id="783af01f-87a7-412c-be99-293a162652b5" name="com.mbeddr.core.embedded" version="1" />
-    <use id="ca9e3cd7-a4a7-4d94-943e-79c063754879" name="com.mbeddr.mpsutil.favourites" version="-1" />
     <devkit ref="d2a9c55c-6bdc-4cc2-97e1-4ba7552f5584(com.mbeddr.core)" />
     <devkit ref="aa72fbcf-7e79-465b-a4d9-4517ef4624ee(com.mbeddr.concurrency)" />
   </languages>
@@ -13,11 +12,6 @@
     <language id="0d04a6cc-773e-4069-b9b0-11884b2ff1c8" name="com.mbeddr.ext.units">
       <concept id="5348704582971040037" name="com.mbeddr.ext.units.structure.UnitConfigItem" flags="ng" index="2eh4Hv" />
     </language>
-    <language id="ca9e3cd7-a4a7-4d94-943e-79c063754879" name="com.mbeddr.mpsutil.favourites">
-      <concept id="1259468517902790203" name="com.mbeddr.mpsutil.favourites.structure.FavouritesAnnotation" flags="ng" index="2Y6aBa">
-        <property id="1259468517902790204" name="category" index="2Y6aBd" />
-      </concept>
-    </language>
     <language id="a9d69647-0840-491e-bf39-2eb0805d2011" name="com.mbeddr.core.statements">
       <concept id="6275792049641600983" name="com.mbeddr.core.statements.structure.IfStatement" flags="ng" index="c0U19">
         <child id="6275792049641600984" name="condition" index="c0U16" />
@@ -878,9 +872,6 @@
     <node concept="2NXPZ9" id="4hMIGYxmNEu" role="N3F5h">
       <property role="TrG5h" value="empty_1437114832212_3" />
     </node>
-    <node concept="2Y6aBa" id="FniR$CkA4G" role="lGtFl">
-      <property role="2Y6aBd" value="C Extensions" />
-    </node>
   </node>
   <node concept="N3F5e" id="73GSrjdv3PC">
     <property role="TrG5h" value="Main" />
diff --git a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/defaultExtensions.mps b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/defaultExtensions.mps
index 47edd4989e1..27f9a95e8af 100644
--- a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/defaultExtensions.mps
+++ b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/defaultExtensions.mps
@@ -6,7 +6,6 @@
     <use id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext" version="-1" />
     <use id="2374bc90-7e37-41f1-a9c4-c2e35194c36a" name="com.mbeddr.doc" version="4" />
     <use id="b574d547-b77e-4fed-9f60-c349c4410765" name="com.mbeddr.ext.math" version="-1" />
-    <use id="ca9e3cd7-a4a7-4d94-943e-79c063754879" name="com.mbeddr.mpsutil.favourites" version="-1" />
     <use id="c9a5ade7-5f6a-41ae-a703-5d94a418cf4f" name="com.mbeddr.analyses.cbmc.components" version="0" />
     <use id="daa1849d-6955-4fef-afe3-8aea1f61e6fa" name="com.mbeddr.analyses.cbmc.statemachines" version="0" />
     <use id="2693fc71-9b0e-4b05-ab13-f57227d675f2" name="com.mbeddr.core.util" version="0" />
@@ -125,11 +124,6 @@
         <reference id="6638119994895244607" name="verificationEntryPoint" index="1cekJ8" />
       </concept>
     </language>
-    <language id="ca9e3cd7-a4a7-4d94-943e-79c063754879" name="com.mbeddr.mpsutil.favourites">
-      <concept id="1259468517902790203" name="com.mbeddr.mpsutil.favourites.structure.FavouritesAnnotation" flags="ng" index="2Y6aBa">
-        <property id="1259468517902790204" name="category" index="2Y6aBd" />
-      </concept>
-    </language>
     <language id="a9d69647-0840-491e-bf39-2eb0805d2011" name="com.mbeddr.core.statements">
       <concept id="8441331188640771826" name="com.mbeddr.core.statements.structure.WhileStatement" flags="ng" index="27v$Wf">
         <child id="8441331188640771828" name="body" index="27v$W9" />
@@ -748,7 +742,7 @@
         <property id="6720495385597071502" name="bounds_y" index="gqqTW" />
         <property id="6720495385597071503" name="bounds_width" index="gqqTX" />
         <property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
-        <property id="4583510071007917016" name="transform" index="TgtnS" />
+        <property id="4583510071007917016" name="portTransform" index="TgtnS" />
         <child id="738815095926774816" name="portLayouts" index="1pap1a" />
       </concept>
       <concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
@@ -2840,9 +2834,6 @@
     <node concept="3GEVxB" id="1VMOGozBg9P" role="2OODSX">
       <ref role="3GEb4d" to="cmgk:yGiRIF6Rhw" resolve="SIUnits" />
     </node>
-    <node concept="2Y6aBa" id="FniR$CkWVg" role="lGtFl">
-      <property role="2Y6aBd" value="C Extensions" />
-    </node>
   </node>
   <node concept="N3F5e" id="1w5Xuj1QYPN">
     <property role="TrG5h" value="Components" />
@@ -5217,9 +5208,6 @@
     <node concept="3GEVxB" id="1VMOGozCjSR" role="2OODSX">
       <ref role="3GEb4d" to="cmgk:yGiRIF6Rhw" resolve="SIUnits" />
     </node>
-    <node concept="2Y6aBa" id="FniR$CkHZp" role="lGtFl">
-      <property role="2Y6aBd" value="C Extensions" />
-    </node>
   </node>
   <node concept="N3F5e" id="4usdeMNVnYi">
     <property role="TrG5h" value="StateMachines" />
@@ -7979,9 +7967,6 @@
     <node concept="3GEVxB" id="1VMOGozC6r_" role="2OODSX">
       <ref role="3GEb4d" to="cmgk:yGiRIF6Rhw" resolve="SIUnits" />
     </node>
-    <node concept="2Y6aBa" id="FniR$Cl80t" role="lGtFl">
-      <property role="2Y6aBd" value="C Extensions" />
-    </node>
   </node>
   <node concept="N3F5e" id="4usdeMNVog3">
     <property role="TrG5h" value="LibraryAccess" />
@@ -10744,9 +10729,6 @@
     <node concept="3GEVxB" id="1VMOGozC6r6" role="2OODSX">
       <ref role="3GEb4d" to="cmgk:yGiRIF6Rhw" resolve="SIUnits" />
     </node>
-    <node concept="2Y6aBa" id="FniR$CleAP" role="lGtFl">
-      <property role="2Y6aBd" value="PLE" />
-    </node>
   </node>
   <node concept="Idr$i" id="4I37X0YSE77">
     <property role="3GE5qa" value="config" />
@@ -11481,9 +11463,6 @@
       <ref role="2dvl_Q" node="4I37X0YSZr3" resolve="FlightProcessor" />
       <ref role="AiAcg" node="4I37X0YSZtg" resolve="cfgDoNothing" />
     </node>
-    <node concept="2Y6aBa" id="FniR$ClJLP" role="lGtFl">
-      <property role="2Y6aBd" value="PLE" />
-    </node>
   </node>
   <node concept="N3F5e" id="5NYlgF0xW$c">
     <property role="TrG5h" value="ComponentsSRI" />
@@ -14531,9 +14510,6 @@
     <node concept="2NXPZ9" id="7kmhBx3QJ$l" role="N3F5h">
       <property role="TrG5h" value="empty_1437758104238_39" />
     </node>
-    <node concept="2Y6aBa" id="FniR$Cl1nk" role="lGtFl">
-      <property role="2Y6aBd" value="C Extensions" />
-    </node>
   </node>
 </model>
 
diff --git a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/docs.mps b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/docs.mps
index 93b40475993..b9093b1979a 100644
--- a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/docs.mps
+++ b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/docs.mps
@@ -47,7 +47,7 @@
         <property id="126932837435370852" name="email" index="Wq1Bq" />
         <property id="126932837435370851" name="name" index="Wq1Bt" />
       </concept>
-      <concept id="5185579450379273118" name="com.mbeddr.doc.structure.TextParHeader" flags="ng" index="1xAIan">
+      <concept id="5185579450379273118" name="com.mbeddr.doc.structure.TextParagraphHeader" flags="ng" index="1xAIan">
         <property id="5185579450379273119" name="text" index="1xAIam" />
       </concept>
       <concept id="3350625596580089586" name="com.mbeddr.doc.structure.TextParagraph" flags="ng" index="1_0LV8">
@@ -88,8 +88,8 @@
       </concept>
     </language>
     <language id="1c5b7d51-0ef3-4332-af36-874466950878" name="com.mbeddr.doc.expressions">
-      <concept id="5378658552263149308" name="com.mbeddr.doc.expressions.structure.VariableDef" flags="ng" index="3XpXe8" />
-      <concept id="5378658552263151469" name="com.mbeddr.doc.expressions.structure.VarRef" flags="ng" index="3XpXCp">
+      <concept id="5378658552263149308" name="com.mbeddr.doc.expressions.structure.VariableDefinition" flags="ng" index="3XpXe8" />
+      <concept id="5378658552263151469" name="com.mbeddr.doc.expressions.structure.VariableReference" flags="ng" index="3XpXCp">
         <reference id="5378658552263151470" name="var" index="3XpXCq" />
       </concept>
       <concept id="5378658552263151447" name="com.mbeddr.doc.expressions.structure.Equation" flags="ng" index="3XpXCz">
diff --git a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/math.mps b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/math.mps
index b8cdb3cde1d..dd20c040989 100644
--- a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/math.mps
+++ b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/math.mps
@@ -3,16 +3,10 @@
   <persistence version="9" />
   <languages>
     <use id="b574d547-b77e-4fed-9f60-c349c4410765" name="com.mbeddr.ext.math" version="0" />
-    <use id="ca9e3cd7-a4a7-4d94-943e-79c063754879" name="com.mbeddr.mpsutil.favourites" version="0" />
     <devkit ref="d2a9c55c-6bdc-4cc2-97e1-4ba7552f5584(com.mbeddr.core)" />
   </languages>
   <imports />
   <registry>
-    <language id="ca9e3cd7-a4a7-4d94-943e-79c063754879" name="com.mbeddr.mpsutil.favourites">
-      <concept id="1259468517902790203" name="com.mbeddr.mpsutil.favourites.structure.FavouritesAnnotation" flags="ng" index="2Y6aBa">
-        <property id="1259468517902790204" name="category" index="2Y6aBd" />
-      </concept>
-    </language>
     <language id="a9d69647-0840-491e-bf39-2eb0805d2011" name="com.mbeddr.core.statements">
       <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
         <child id="7763322639126652758" name="baseType" index="2umbIo" />
@@ -136,9 +130,6 @@
       </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">
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
-      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
@@ -686,9 +677,6 @@
         <property role="2vmPJh" value="Hello, World!" />
       </node>
     </node>
-    <node concept="2Y6aBa" id="FniR$ClmFV" role="lGtFl">
-      <property role="2Y6aBd" value="C Extensions" />
-    </node>
   </node>
   <node concept="2v9HqL" id="4r1mNB_vx4R">
     <node concept="2AWWZL" id="4r1mNB_vx4S" role="2AWWZH">
diff --git a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/req.mps b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/req.mps
index b94a2410b11..cf420661858 100644
--- a/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/req.mps
+++ b/code/applications/tutorial/solutions/mbeddr.tutorial.main/models/mbeddr/tutorial/main/req.mps
@@ -7,7 +7,6 @@
     <use id="983e02f8-8062-426e-b60d-bc044a46b93a" name="com.mbeddr.cc.requirements.report" version="0" />
     <use id="7a52ca96-9053-41d2-ae13-8cee05f36698" name="com.mbeddr.cc.requirements.c2doc" version="0" />
     <use id="b9f5080f-7f6a-4d86-b994-77d4c982153a" name="com.mbeddr.cc.requirements.scenario2doc" version="0" />
-    <use id="ca9e3cd7-a4a7-4d94-943e-79c063754879" name="com.mbeddr.mpsutil.favourites" version="0" />
     <use id="d3a0fd26-445a-466c-900e-10444ddfed52" name="com.mbeddr.mpsutil.filepicker" version="0" />
     <devkit ref="a4dac888-0788-4852-b4c0-f386bf6f2c0b(com.mbeddr.cc.reqtrace)" />
     <devkit ref="d2a9c55c-6bdc-4cc2-97e1-4ba7552f5584(com.mbeddr.core)" />
@@ -17,7 +16,7 @@
   <registry>
     <language id="2dec0852-3a21-4c4e-a68c-b05236cc37f2" name="com.mbeddr.doc.gen_xhtml">
       <concept id="3350625596580275037" name="com.mbeddr.doc.gen_xhtml.structure.HTMLRenderer" flags="ng" index="1_07dB" />
-      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLDummyRenderer" flags="ng" index="1TaS0h" />
+      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLNoOutputRenderer" flags="ng" index="1TaS0h" />
     </language>
     <language id="d6714220-402d-48cb-a4a2-88223c6257f6" name="com.mbeddr.cc.requirements.scenarios">
       <concept id="6514529288613812198" name="com.mbeddr.cc.requirements.scenarios.structure.UseCaseKind" flags="ng" index="4R1oT" />
@@ -93,11 +92,6 @@
         <child id="6446320527598554647" name="data" index="3UDY1a" />
       </concept>
     </language>
-    <language id="ca9e3cd7-a4a7-4d94-943e-79c063754879" name="com.mbeddr.mpsutil.favourites">
-      <concept id="1259468517902790203" name="com.mbeddr.mpsutil.favourites.structure.FavouritesAnnotation" flags="ng" index="2Y6aBa">
-        <property id="1259468517902790204" name="category" index="2Y6aBd" />
-      </concept>
-    </language>
     <language id="a9d69647-0840-491e-bf39-2eb0805d2011" name="com.mbeddr.core.statements">
       <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
         <child id="7254843406768833939" name="expr" index="1_9egR" />
@@ -1102,9 +1096,6 @@
       </node>
     </node>
     <node concept="2RsZnQ" id="2TTzVZwqvwb" role="2RsZnW" />
-    <node concept="2Y6aBa" id="FniR$CltW3" role="lGtFl">
-      <property role="2Y6aBd" value="Requirements" />
-    </node>
   </node>
   <node concept="3fbPIq" id="72IKZbjZLi7">
     <property role="TrG5h" value="ArchitecturalComponents" />
@@ -1304,9 +1295,6 @@
         <node concept="19SUe$" id="2TTzVZwqvwa" role="19SJt6" />
       </node>
     </node>
-    <node concept="2Y6aBa" id="FniR$ClGbG" role="lGtFl">
-      <property role="2Y6aBd" value="Requirements" />
-    </node>
   </node>
   <node concept="3fbPIq" id="5YVZL2kzViv">
     <property role="TrG5h" value="UseCases" />
@@ -1689,9 +1677,6 @@
       </node>
     </node>
     <node concept="2RsZnQ" id="2TTzVZwqvwc" role="2RsZnW" />
-    <node concept="2Y6aBa" id="FniR$ClnkY" role="lGtFl">
-      <property role="2Y6aBd" value="Requirements" />
-    </node>
   </node>
   <node concept="1_1swa" id="519ky_SmMSS">
     <property role="TrG5h" value="requirementsReport" />
diff --git a/code/languages/com.mbeddr.analyses/_spreferences/CodeReviewPreferences/module.msd b/code/languages/com.mbeddr.analyses/_spreferences/CodeReviewPreferences/module.msd
index 71ca50617db..2a14117cae8 100644
--- a/code/languages/com.mbeddr.analyses/_spreferences/CodeReviewPreferences/module.msd
+++ b/code/languages/com.mbeddr.analyses/_spreferences/CodeReviewPreferences/module.msd
@@ -24,6 +24,7 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.cbmc.xmodel.plan/com.mbeddr.analyses.cbmc.xmodel.plan.msd b/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.cbmc.xmodel.plan/com.mbeddr.analyses.cbmc.xmodel.plan.msd
index 0302acf8fcb..74bced83334 100644
--- a/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.cbmc.xmodel.plan/com.mbeddr.analyses.cbmc.xmodel.plan.msd
+++ b/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.cbmc.xmodel.plan/com.mbeddr.analyses.cbmc.xmodel.plan.msd
@@ -12,7 +12,7 @@
   </facets>
   <sourcePath />
   <languageVersions>
-    <language slang="l:c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1:de.slisson.mps.hacks.xmodelgen" version="0" />
+    <language slang="l:c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1:de.itemis.mps.hacks.xmodelgen" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
diff --git a/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.cbmc.xmodel.plan/models/genplan.mps b/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.cbmc.xmodel.plan/models/genplan.mps
index 70ff8cacf38..d4fead2cc36 100644
--- a/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.cbmc.xmodel.plan/models/genplan.mps
+++ b/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.cbmc.xmodel.plan/models/genplan.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan" version="1" />
-    <use id="c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1" name="de.slisson.mps.hacks.xmodelgen" version="0" />
+    <use id="c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1" name="de.itemis.mps.hacks.xmodelgen" version="0" />
   </languages>
   <imports>
     <import index="8r34" ref="r:5f62df63-885f-42f0-80d6-e13ad6c51489(com.mbeddr.core.modules.gen.generator.template.main@generator)" implicit="true" />
@@ -52,12 +52,12 @@
       </concept>
       <concept id="3750601816081736033" name="jetbrains.mps.lang.generator.plan.structure.InPlaceCheckpointSpec" flags="ng" index="3ps74r" />
     </language>
-    <language id="c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1" name="de.slisson.mps.hacks.xmodelgen">
-      <concept id="961590472824346305" name="de.slisson.mps.hacks.xmodelgen.structure.MappingConfigStep" flags="ng" index="2Pg1uL">
+    <language id="c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1" name="de.itemis.mps.hacks.xmodelgen">
+      <concept id="961590472824346305" name="de.itemis.mps.hacks.xmodelgen.structure.MappingConfigStep" flags="ng" index="2Pg1uL">
         <child id="7786846688815598697" name="mappingConfigurations" index="3VlUeB" />
       </concept>
-      <concept id="961590472824361214" name="de.slisson.mps.hacks.xmodelgen.structure.MCListLanguageIdentity" flags="ng" index="2Pgd6e" />
-      <concept id="7786846688815408482" name="de.slisson.mps.hacks.xmodelgen.structure.MappingConfigurationReference" flags="ng" index="3Vl8EG">
+      <concept id="961590472824361214" name="de.itemis.mps.hacks.xmodelgen.structure.MCListLanguageIdentity" flags="ng" index="2Pgd6e" />
+      <concept id="7786846688815408482" name="de.itemis.mps.hacks.xmodelgen.structure.MappingConfigurationReference" flags="ng" index="3Vl8EG">
         <reference id="7786846688815408483" name="mc" index="3Vl8EH" />
       </concept>
     </language>
diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
index 8d33ef1bccf..1f67c964f54 100644
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
@@ -8659,7 +8659,7 @@
         </node>
         <node concept="1SiIV0" id="3bBtawTixeq" role="3bR37C">
           <node concept="3bR9La" id="3bBtawTixer" role="1SiIV1">
-            <ref role="3bR37D" to="90a9:6860Y5A00Lp" resolve="com.mbeddr.mpsutil.serializer.xml" />
+            <ref role="3bR37D" to="90a9:6860Y5A00Lp" resolve="de.itemis.mps.utils.serializer.xml" />
           </node>
         </node>
         <node concept="1BupzO" id="4PRpvcZJNt3" role="3bR31x">
@@ -19992,7 +19992,7 @@
         </node>
         <node concept="1SiIV0" id="3bBtawTixVd" role="3bR37C">
           <node concept="3bR9La" id="3bBtawTixVe" role="1SiIV1">
-            <ref role="3bR37D" to="90a9:6860Y5A00Lp" resolve="com.mbeddr.mpsutil.serializer.xml" />
+            <ref role="3bR37D" to="90a9:6860Y5A00Lp" resolve="de.itemis.mps.utils.serializer.xml" />
           </node>
         </node>
         <node concept="1SiIV0" id="30xB0zHz3$9" role="3bR37C">
diff --git a/code/languages/com.mbeddr.cc/_spreferences/CodeReviewPreferences/module.msd b/code/languages/com.mbeddr.cc/_spreferences/CodeReviewPreferences/module.msd
index 0de9deebf68..ce06427060b 100644
--- a/code/languages/com.mbeddr.cc/_spreferences/CodeReviewPreferences/module.msd
+++ b/code/languages/com.mbeddr.cc/_spreferences/CodeReviewPreferences/module.msd
@@ -24,6 +24,7 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/generator/template/com/mbeddr/cc/requirements/report/generator/template/main@generator.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/generator/template/com/mbeddr/cc/requirements/report/generator/template/main@generator.mps
index 31d1783cd71..9dab6baaffd 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/generator/template/com/mbeddr/cc/requirements/report/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/generator/template/com/mbeddr/cc/requirements/report/generator/template/main@generator.mps
@@ -140,7 +140,7 @@
     </language>
     <language id="2374bc90-7e37-41f1-a9c4-c2e35194c36a" name="com.mbeddr.doc">
       <concept id="4317007310193476045" name="com.mbeddr.doc.structure.ScaleDownNotUp100" flags="ng" index="2bctqb" />
-      <concept id="3126418051240156265" name="com.mbeddr.doc.structure.Invisble" flags="ng" index="oUDze">
+      <concept id="3126418051240156265" name="com.mbeddr.doc.structure.Invisible" flags="ng" index="oUDze">
         <child id="3126418051240385698" name="contents" index="oVxw5" />
       </concept>
       <concept id="2588579461812060090" name="com.mbeddr.doc.structure.Visualization" flags="ng" index="tKojO">
@@ -172,7 +172,7 @@
       <concept id="5185579450379471862" name="com.mbeddr.doc.structure.StringTableCell" flags="ng" index="1xAuFZ">
         <property id="5185579450379471864" name="text" index="1xAuFL" />
       </concept>
-      <concept id="5185579450379273118" name="com.mbeddr.doc.structure.TextParHeader" flags="ng" index="1xAIan">
+      <concept id="5185579450379273118" name="com.mbeddr.doc.structure.TextParagraphHeader" flags="ng" index="1xAIan">
         <property id="5185579450379273119" name="text" index="1xAIam" />
       </concept>
       <concept id="3350625596580089586" name="com.mbeddr.doc.structure.TextParagraph" flags="ng" index="1_0LV8">
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/solutions/pluginSolution/pluginSolution.msd b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/solutions/pluginSolution/pluginSolution.msd
index 789773d7c12..066f89fce1c 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/solutions/pluginSolution/pluginSolution.msd
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/solutions/pluginSolution/pluginSolution.msd
@@ -54,8 +54,12 @@
     <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
     <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+    <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
+    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
+    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/trace.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/trace.mpl
index 934da139ce7..4bbf7856778 100644
--- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/trace.mpl
+++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/trace.mpl
@@ -80,8 +80,12 @@
         <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
         <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
         <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+        <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
         <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
+        <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+        <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
+        <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
@@ -181,6 +185,7 @@
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
   </dependencyVersions>
diff --git a/code/languages/com.mbeddr.core/_spreferences/CodeReviewPreferences/module.msd b/code/languages/com.mbeddr.core/_spreferences/CodeReviewPreferences/module.msd
index ebc43a6819e..3a420e43721 100644
--- a/code/languages/com.mbeddr.core/_spreferences/CodeReviewPreferences/module.msd
+++ b/code/languages/com.mbeddr.core/_spreferences/CodeReviewPreferences/module.msd
@@ -24,6 +24,7 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/base.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/base.mpl
index c01f6c8b42b..2bed04b7385 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/base.mpl
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/base.mpl
@@ -73,8 +73,12 @@
         <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
         <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
         <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+        <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
         <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
+        <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+        <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
+        <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
       </dependencyVersions>
       <mapping-priorities />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/pluginSolution.msd b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/pluginSolution.msd
index 8ea8ff15da2..d7e14a69374 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/pluginSolution.msd
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/pluginSolution.msd
@@ -98,9 +98,13 @@
     <module reference="8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)" version="0" />
     <module reference="25092e07-e655-497c-92fb-558a8e3080ed(jetbrains.mps.ide.ui)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+    <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
+    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
+    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="f647e48e-4568-4f4c-b48a-1546492c6a2e(org.jdom)" version="0" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/com.mbeddr.core.codereview.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/com.mbeddr.core.codereview.mpl
index 70091e99df3..be86402acda 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/com.mbeddr.core.codereview.mpl
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/com.mbeddr.core.codereview.mpl
@@ -13,7 +13,7 @@
   <accessoryModels />
   <sourcePath />
   <dependencies>
-    <dependency reexport="false">5454dbfd-2075-4de0-b85e-fa645eb6957e(com.mbeddr.mpsutil.serializer.xml)</dependency>
+    <dependency reexport="false">5454dbfd-2075-4de0-b85e-fa645eb6957e(de.itemis.mps.utils.serializer.xml)</dependency>
     <dependency reexport="false">b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)</dependency>
     <dependency reexport="false">9e24fcdc-a232-4d24-8c95-1f525946191a(com.mbeddr.core.base.pluginSolution)</dependency>
     <dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
@@ -89,10 +89,10 @@
     <module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
     <module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
     <module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
-    <module reference="5454dbfd-2075-4de0-b85e-fa645eb6957e(com.mbeddr.mpsutil.serializer.xml)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
+    <module reference="5454dbfd-2075-4de0-b85e-fa645eb6957e(de.itemis.mps.utils.serializer.xml)" version="0" />
     <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
     <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
@@ -108,6 +108,7 @@
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)" version="0" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/editor.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/editor.mps
index 84a281bb24d..ddff01ebbd9 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/editor.mps
@@ -462,14 +462,14 @@
         <child id="6856661361479798957" name="actions" index="130p63" />
         <child id="6856661361479732085" name="cell" index="130CDr" />
       </concept>
-      <concept id="4874944647490522665" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2_IsApplicable" flags="ig" index="1eYwpX" />
-      <concept id="4874944647490524676" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2_Execute" flags="ig" index="1eYxTg" />
-      <concept id="4874944647490471126" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2" flags="ng" index="1eYWM2">
+      <concept id="4874944647490522665" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell_IsApplicable" flags="ig" index="1eYwpX" />
+      <concept id="4874944647490524676" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell_Execute" flags="ig" index="1eYxTg" />
+      <concept id="4874944647490471126" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell" flags="ng" index="1eYWM2">
         <child id="4874944647490523335" name="matchingText" index="1eYxyj" />
         <child id="4874944647490523330" name="isApplicable" index="1eYxym" />
         <child id="4874944647490524677" name="execute" index="1eYxTh" />
       </concept>
-      <concept id="4874944647490471525" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2_MatchingText" flags="ig" index="1eYWSL" />
+      <concept id="4874944647490471525" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell_MatchingText" flags="ig" index="1eYWSL" />
       <concept id="7363578995839203705" name="com.mbeddr.mpsutil.grammarcells.structure.FlagCell" flags="sg" stub="1984422498400729024" index="1kHk_G">
         <property id="7617962380315063287" name="flagText" index="ZjSer" />
         <property id="8224407690718723337" name="doNotGenerateNodeSubstituteAction" index="ZpkCL" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.qa/com.mbeddr.core.qa.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.qa/com.mbeddr.core.qa.mpl
index bdca4c06edd..9948f923fda 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.qa/com.mbeddr.core.qa.mpl
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.qa/com.mbeddr.core.qa.mpl
@@ -75,8 +75,12 @@
         <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
         <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
         <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+        <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
         <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
+        <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+        <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
+        <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
       </dependencyVersions>
       <mapping-priorities />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/editor.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/editor.mps
index 66433e904aa..afddc75cf5f 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/editor.mps
@@ -389,14 +389,14 @@
         <child id="8207263695490893799" name="symbols" index="2ElW$Z" />
       </concept>
       <concept id="8945098465480383073" name="com.mbeddr.mpsutil.grammarcells.structure.OptionalCell_TransformationText" flags="ig" index="ZYGn8" />
-      <concept id="4874944647490522665" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2_IsApplicable" flags="ig" index="1eYwpX" />
-      <concept id="4874944647490524676" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2_Execute" flags="ig" index="1eYxTg" />
-      <concept id="4874944647490471126" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2" flags="ng" index="1eYWM2">
+      <concept id="4874944647490522665" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell_IsApplicable" flags="ig" index="1eYwpX" />
+      <concept id="4874944647490524676" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell_Execute" flags="ig" index="1eYxTg" />
+      <concept id="4874944647490471126" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell" flags="ng" index="1eYWM2">
         <child id="4874944647490523335" name="matchingText" index="1eYxyj" />
         <child id="4874944647490523330" name="isApplicable" index="1eYxym" />
         <child id="4874944647490524677" name="execute" index="1eYxTh" />
       </concept>
-      <concept id="4874944647490471525" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2_MatchingText" flags="ig" index="1eYWSL" />
+      <concept id="4874944647490471525" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell_MatchingText" flags="ig" index="1eYWSL" />
       <concept id="484443907672824414" name="com.mbeddr.mpsutil.grammarcells.structure.FlagCell_SubstituteCondition" flags="ig" index="3gMsPO" />
       <concept id="7363578995839203705" name="com.mbeddr.mpsutil.grammarcells.structure.FlagCell" flags="sg" stub="1984422498400729024" index="1kHk_G">
         <property id="7617962380315063287" name="flagText" index="ZjSer" />
diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.interpreterdebugger.rt/com.mbeddr.core.interpreterdebugger.rt.msd b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.interpreterdebugger.rt/com.mbeddr.core.interpreterdebugger.rt.msd
index bef2c7cc4a1..3f348fb0291 100644
--- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.interpreterdebugger.rt/com.mbeddr.core.interpreterdebugger.rt.msd
+++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.interpreterdebugger.rt/com.mbeddr.core.interpreterdebugger.rt.msd
@@ -59,8 +59,12 @@
     <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
     <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+    <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
+    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
+    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/code/languages/com.mbeddr.core/tests/test.assessments.testlang/test.assessments.testlang.mpl b/code/languages/com.mbeddr.core/tests/test.assessments.testlang/test.assessments.testlang.mpl
index f9599457646..14ccba91d87 100644
--- a/code/languages/com.mbeddr.core/tests/test.assessments.testlang/test.assessments.testlang.mpl
+++ b/code/languages/com.mbeddr.core/tests/test.assessments.testlang/test.assessments.testlang.mpl
@@ -72,9 +72,13 @@
     <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
     <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+    <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
+    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
+    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="2ae9b0c0-0e87-4510-aa2a-9949fa0436bf(test.assessments.testlang)" version="0" />
   </dependencyVersions>
diff --git a/code/languages/com.mbeddr.core/tests/test.assessments/test.assessments.msd b/code/languages/com.mbeddr.core/tests/test.assessments/test.assessments.msd
index abf9bfbb4e4..c12600862bc 100644
--- a/code/languages/com.mbeddr.core/tests/test.assessments/test.assessments.msd
+++ b/code/languages/com.mbeddr.core/tests/test.assessments/test.assessments.msd
@@ -61,8 +61,12 @@
     <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
     <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+    <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
+    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
+    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="c540669f-7495-4f0f-b5fc-81eb94934084(test.assessments)" version="0" />
     <module reference="2ae9b0c0-0e87-4510-aa2a-9949fa0436bf(test.assessments.testlang)" version="0" />
diff --git a/code/languages/com.mbeddr.debugger.tests/_spreferences/CodeReviewPreferences/module.msd b/code/languages/com.mbeddr.debugger.tests/_spreferences/CodeReviewPreferences/module.msd
index 920d1588e98..56ad74e14f5 100644
--- a/code/languages/com.mbeddr.debugger.tests/_spreferences/CodeReviewPreferences/module.msd
+++ b/code/languages/com.mbeddr.debugger.tests/_spreferences/CodeReviewPreferences/module.msd
@@ -24,6 +24,7 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/code/languages/com.mbeddr.debugger.tests/languages/com.mbeddr.core.debug.util/util.mpl b/code/languages/com.mbeddr.debugger.tests/languages/com.mbeddr.core.debug.util/util.mpl
index b8e0a6405b9..784f0802428 100644
--- a/code/languages/com.mbeddr.debugger.tests/languages/com.mbeddr.core.debug.util/util.mpl
+++ b/code/languages/com.mbeddr.debugger.tests/languages/com.mbeddr.core.debug.util/util.mpl
@@ -70,8 +70,12 @@
         <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
         <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
         <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+        <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
         <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
+        <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+        <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
+        <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
       </dependencyVersions>
       <mapping-priorities />
diff --git a/code/languages/com.mbeddr.debugger.tests/tests/test.debugging.core/core.msd b/code/languages/com.mbeddr.debugger.tests/tests/test.debugging.core/core.msd
index 2fc5ba63b80..13dd0db89f3 100644
--- a/code/languages/com.mbeddr.debugger.tests/tests/test.debugging.core/core.msd
+++ b/code/languages/com.mbeddr.debugger.tests/tests/test.debugging.core/core.msd
@@ -90,8 +90,12 @@
     <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
     <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+    <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
+    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
+    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="e7bd1f04-9809-412c-acab-9bc644133ec1(test.debugging.core)" version="0" />
diff --git a/code/languages/com.mbeddr.debugger.tests/tests/test.debugging.cross/test.debugging.cross.msd b/code/languages/com.mbeddr.debugger.tests/tests/test.debugging.cross/test.debugging.cross.msd
index 4efb1a92d55..6f3c9c17508 100644
--- a/code/languages/com.mbeddr.debugger.tests/tests/test.debugging.cross/test.debugging.cross.msd
+++ b/code/languages/com.mbeddr.debugger.tests/tests/test.debugging.cross/test.debugging.cross.msd
@@ -27,6 +27,7 @@
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="6" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
diff --git a/code/languages/com.mbeddr.debugger/_spreferences/CodeReviewPreferences/module.msd b/code/languages/com.mbeddr.debugger/_spreferences/CodeReviewPreferences/module.msd
index cfb2de0ed62..fad30bfb3c6 100644
--- a/code/languages/com.mbeddr.debugger/_spreferences/CodeReviewPreferences/module.msd
+++ b/code/languages/com.mbeddr.debugger/_spreferences/CodeReviewPreferences/module.msd
@@ -24,6 +24,7 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage.extended/com.mbeddr.doc.aspect.exampleLanguage.extended.mpl b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage.extended/com.mbeddr.doc.aspect.exampleLanguage.extended.mpl
index 3ee3d96bb66..1e949999d09 100644
--- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage.extended/com.mbeddr.doc.aspect.exampleLanguage.extended.mpl
+++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage.extended/com.mbeddr.doc.aspect.exampleLanguage.extended.mpl
@@ -39,6 +39,8 @@
         <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
         <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
         <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="3" />
+        <module reference="2374bc90-7e37-41f1-a9c4-c2e35194c36a(com.mbeddr.doc)" version="0" />
+        <module reference="38a074ed-e5ad-4b2d-be31-ca436911b8aa(com.mbeddr.doc.aspect)" version="0" />
         <module reference="3c21902d-b582-4557-b697-84a4dcddff3a(com.mbeddr.doc.aspect.exampleLanguage)" version="0" />
         <module reference="1e00450a-fc72-4f66-9571-30e5e083c1fa(com.mbeddr.doc.aspect.exampleLanguage.extended)" version="0" />
         <module reference="0bdd4dd1-2109-4df7-b571-35f91847c35e(com.mbeddr.doc.aspect.exampleLanguage.extended#264158922270111601)" version="0" />
@@ -48,6 +50,7 @@
         <module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" 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="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
         <module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
         <module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
         <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
@@ -59,8 +62,12 @@
         <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
         <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
         <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+        <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
         <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
+        <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+        <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
+        <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
       </dependencyVersions>
       <mapping-priorities />
@@ -123,6 +130,7 @@
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="3" />
     <module reference="2374bc90-7e37-41f1-a9c4-c2e35194c36a(com.mbeddr.doc)" version="0" />
+    <module reference="38a074ed-e5ad-4b2d-be31-ca436911b8aa(com.mbeddr.doc.aspect)" version="0" />
     <module reference="3c21902d-b582-4557-b697-84a4dcddff3a(com.mbeddr.doc.aspect.exampleLanguage)" version="0" />
     <module reference="1e00450a-fc72-4f66-9571-30e5e083c1fa(com.mbeddr.doc.aspect.exampleLanguage.extended)" version="0" />
     <module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com/mbeddr/doc/aspect/exampleLanguage/structure.mps b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com/mbeddr/doc/aspect/exampleLanguage/structure.mps
index d12e99d33a6..d042cb29fad 100644
--- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com/mbeddr/doc/aspect/exampleLanguage/structure.mps
+++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com/mbeddr/doc/aspect/exampleLanguage/structure.mps
@@ -146,7 +146,7 @@
     <property role="EcuMT" value="2265458908607221014" />
     <property role="TrG5h" value="CostAttribute" />
     <property role="34LRSv" value="cost" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="1XKxHZsLKOp" role="PzmwI">
       <ref role="PrY4T" node="1XKxHZsLKOl" resolve="IAttribute" />
     </node>
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/sandbox/com.mbeddr.doc.aspect.exampleLanguage.sandbox.msd b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/sandbox/com.mbeddr.doc.aspect.exampleLanguage.sandbox.msd
index 67864f41e3d..eac3fe4d8cc 100644
--- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/sandbox/com.mbeddr.doc.aspect.exampleLanguage.sandbox.msd
+++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/sandbox/com.mbeddr.doc.aspect.exampleLanguage.sandbox.msd
@@ -25,6 +25,7 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/plugin.mps b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/plugin.mps
index 96341750c28..c3b2be380eb 100644
--- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/plugin.mps
+++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/models/com/mbeddr/doc/aspect/plugin.mps
@@ -249,7 +249,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="3qokpdXQc2_" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="3qokpdXQcd5" role="jymVt" />
@@ -265,7 +265,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="3qokpdXQc30" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="3UR2Jj" id="5X4OV7_F$Aa" role="lGtFl">
diff --git a/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.runtime/models/com/mbeddr/doc/aspect/runtime.mps b/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.runtime/models/com/mbeddr/doc/aspect/runtime.mps
index de28711a244..00071bc06f3 100644
--- a/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.runtime/models/com/mbeddr/doc/aspect/runtime.mps
+++ b/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.runtime/models/com/mbeddr/doc/aspect/runtime.mps
@@ -421,7 +421,7 @@
             <property role="TrG5h" value="localDocNode" />
             <node concept="3Tqbb2" id="1GfgNpVRbK$" role="1tU5fm" />
             <node concept="1rXfSq" id="1XKxHZsUjEJ" role="33vP2m">
-              <ref role="37wK5l" node="2DFA9RLm5bh" resolve="getDocumentationForConcept" />
+              <ref role="37wK5l" node="2DFA9RLm5bh" resolve="getDocForConceptCached" />
               <node concept="37vLTw" id="1XKxHZsUjEK" role="37wK5m">
                 <ref role="3cqZAo" node="1XKxHZsSvB0" resolve="repository" />
               </node>
@@ -1636,7 +1636,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="1XKxHZsW5vp" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
       </node>
     </node>
     <node concept="2tJIrI" id="6SZYYyyjrZw" role="jymVt" />
@@ -3082,7 +3082,7 @@
               </node>
               <node concept="2OqwBi" id="3qokpdXQLXn" role="3clFbw">
                 <node concept="1rXfSq" id="3qokpdXQLiQ" role="2Oq$k0">
-                  <ref role="37wK5l" node="5ut4bh9phV1" resolve="getConfig" />
+                  <ref role="37wK5l" node="5ut4bh9phV1" resolve="config" />
                 </node>
                 <node concept="liA8E" id="3qokpdXQMvJ" role="2OqNvi">
                   <ref role="37wK5l" to="pgte:1T8cMxCROxk" resolve="showReferenceConceptDocumentation" />
@@ -3281,7 +3281,7 @@
             </node>
             <node concept="2OqwBi" id="5R9SlUlNz7q" role="33vP2m">
               <node concept="37vLTw" id="2JMQ0Qq3aKy" role="2Oq$k0">
-                <ref role="3cqZAo" node="2JMQ0Qq3aKs" resolve="seq" />
+                <ref role="3cqZAo" node="2JMQ0Qq3aKs" resolve="extensions" />
               </node>
               <node concept="1uHKPH" id="5R9SlUlNz7u" role="2OqNvi" />
             </node>
diff --git a/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/models/com/mbeddr/doc/aspect/ui/plugin.mps b/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/models/com/mbeddr/doc/aspect/ui/plugin.mps
index 9b7a2cd2979..0998cf4c300 100644
--- a/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/models/com/mbeddr/doc/aspect/ui/plugin.mps
+++ b/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/models/com/mbeddr/doc/aspect/ui/plugin.mps
@@ -3485,7 +3485,7 @@
                     <property role="2bfB8j" value="true" />
                     <property role="373rjd" value="true" />
                     <ref role="1Y3XeK" to="wyt6:~Runnable" resolve="Runnable" />
-                    <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
+                    <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                     <node concept="3Tm1VV" id="7YOUX1l3g_3" role="1B3o_S" />
                     <node concept="3clFb_" id="7YOUX1l3g_h" role="jymVt">
                       <property role="TrG5h" value="run" />
@@ -4054,7 +4054,7 @@
                         </node>
                       </node>
                       <node concept="2AHcQZ" id="7YOUX1l3g_n" role="2AJF6D">
-                        <ref role="2AI5Lk" to="wyt6:~Override" />
+                        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                       </node>
                     </node>
                   </node>
@@ -4435,7 +4435,7 @@
             <property role="TrG5h" value="e" />
             <property role="3TUv4t" value="true" />
             <node concept="3uibUv" id="24MikXOjzGs" role="1tU5fm">
-              <ref role="3uigEE" to="33ny:~Map$Entry" resolve="Entry" />
+              <ref role="3uigEE" to="33ny:~Map$Entry" resolve="Map.Entry" />
               <node concept="3uibUv" id="24MikXOjTTf" role="11_B2D">
                 <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
               </node>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageAccessories/com/mbeddr/doc/gen_xhtml/defaults.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageAccessories/com/mbeddr/doc/gen_xhtml/defaults.mps
index 1917c19a615..7343fb14163 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageAccessories/com/mbeddr/doc/gen_xhtml/defaults.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/languageAccessories/com/mbeddr/doc/gen_xhtml/defaults.mps
@@ -8,17 +8,17 @@
   <imports />
   <registry>
     <language id="2dec0852-3a21-4c4e-a68c-b05236cc37f2" name="com.mbeddr.doc.gen_xhtml">
-      <concept id="6347396756633822235" name="com.mbeddr.doc.gen_xhtml.structure.CssSpecification" flags="ng" index="7H_Yz">
+      <concept id="6347396756633822235" name="com.mbeddr.doc.gen_xhtml.structure.CSSSpecification" flags="ng" index="7H_Yz">
         <child id="988357225320087812" name="rulesets" index="3zO_yG" />
       </concept>
-      <concept id="988357225320087791" name="com.mbeddr.doc.gen_xhtml.structure.CssDeclaration" flags="ng" index="3zO__7">
+      <concept id="988357225320087791" name="com.mbeddr.doc.gen_xhtml.structure.CSSDeclaration" flags="ng" index="3zO__7">
         <property id="988357225320087842" name="expression" index="3zO_ya" />
         <property id="988357225320087839" name="property" index="3zO_yR" />
       </concept>
-      <concept id="988357225320087766" name="com.mbeddr.doc.gen_xhtml.structure.CssSelector" flags="ng" index="3zO__Y">
+      <concept id="988357225320087766" name="com.mbeddr.doc.gen_xhtml.structure.CSSSelector" flags="ng" index="3zO__Y">
         <property id="988357225320087823" name="text" index="3zO_yB" />
       </concept>
-      <concept id="988357225320077162" name="com.mbeddr.doc.gen_xhtml.structure.CssRuleset" flags="ng" index="3zOSV2">
+      <concept id="988357225320077162" name="com.mbeddr.doc.gen_xhtml.structure.CSSRuleset" flags="ng" index="3zOSV2">
         <child id="988357225320087818" name="declarations" index="3zO_yy" />
         <child id="988357225320087815" name="selectors" index="3zO_yJ" />
       </concept>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.latex/com.mbeddr.doc.latex.mpl b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.latex/com.mbeddr.doc.latex.mpl
index e49de72a45c..2c827023cc0 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.latex/com.mbeddr.doc.latex.mpl
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.latex/com.mbeddr.doc.latex.mpl
@@ -74,9 +74,13 @@
     <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
     <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+    <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
+    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
+    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.qa/com.mbeddr.doc.qa.mpl b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.qa/com.mbeddr.doc.qa.mpl
index 46dc6480d01..fd29127ee3f 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.qa/com.mbeddr.doc.qa.mpl
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.qa/com.mbeddr.doc.qa.mpl
@@ -77,8 +77,12 @@
         <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
         <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
         <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+        <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
         <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
+        <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+        <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
+        <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
       </dependencyVersions>
       <mapping-priorities />
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/generator/template/com/mbeddr/doc/generator/template/main@generator.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/generator/template/com/mbeddr/doc/generator/template/main@generator.mps
index d74a4756d5b..cecc3031f10 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/generator/template/com/mbeddr/doc/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/generator/template/com/mbeddr/doc/generator/template/main@generator.mps
@@ -216,7 +216,7 @@
         <child id="6068976060904007489" name="root" index="30Gjbj" />
       </concept>
       <concept id="6068976060904007493" name="com.mbeddr.doc.structure.IncludableExport" flags="ng" index="30Gjbn" />
-      <concept id="3350625596580269173" name="com.mbeddr.doc.structure.NullRenderer" flags="ng" index="1_05Lf" />
+      <concept id="3350625596580269173" name="com.mbeddr.doc.structure.NoOutputRenderer" flags="ng" index="1_05Lf" />
       <concept id="3350625596580225385" name="com.mbeddr.doc.structure.DocumentRef" flags="ng" index="1_0j5j" />
       <concept id="3350625596580064249" name="com.mbeddr.doc.structure.IDocContentContainer" flags="ng" index="1_0VJ3">
         <child id="3350625596580064250" name="contents" index="1_0VJ0" />
diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/spreadsheat.mpl b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/spreadsheat.mpl
index 75a50e82f04..b4bea33b103 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/spreadsheat.mpl
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/spreadsheat.mpl
@@ -83,8 +83,12 @@
         <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
         <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
         <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+        <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
         <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
+        <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+        <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
+        <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
@@ -177,9 +181,13 @@
     <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
     <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+    <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
+    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
+    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
+    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
diff --git a/code/languages/com.mbeddr.doc/languages/terms/generator/template/com/mbeddr/doc/terms/generator/template/main@generator.mps b/code/languages/com.mbeddr.doc/languages/terms/generator/template/com/mbeddr/doc/terms/generator/template/main@generator.mps
index 531696cd8ac..67726a20148 100644
--- a/code/languages/com.mbeddr.doc/languages/terms/generator/template/com/mbeddr/doc/terms/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.doc/languages/terms/generator/template/com/mbeddr/doc/terms/generator/template/main@generator.mps
@@ -69,7 +69,7 @@
       <concept id="6165313375055797476" name="com.mbeddr.doc.structure.FormattedText" flags="ng" index="$DsGX">
         <child id="6165313375055797477" name="text" index="$DsGW" />
       </concept>
-      <concept id="5185579450379273118" name="com.mbeddr.doc.structure.TextParHeader" flags="ng" index="1xAIan">
+      <concept id="5185579450379273118" name="com.mbeddr.doc.structure.TextParagraphHeader" flags="ng" index="1xAIan">
         <property id="5185579450379273119" name="text" index="1xAIam" />
       </concept>
       <concept id="3350625596580089586" name="com.mbeddr.doc.structure.TextParagraph" flags="ng" index="1_0LV8">
diff --git a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.doc/models/main.mps b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.doc/models/main.mps
index 797f130adfd..03ba9d9d1cd 100644
--- a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.doc/models/main.mps
+++ b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.doc/models/main.mps
@@ -18,7 +18,7 @@
       <concept id="3350625596580275037" name="com.mbeddr.doc.gen_xhtml.structure.HTMLRenderer" flags="ng" index="1_07dB">
         <property id="4457500422381329081" name="stylesheet" index="1jVmeX" />
       </concept>
-      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLDummyRenderer" flags="ng" index="1TaS0h" />
+      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLNoOutputRenderer" flags="ng" index="1TaS0h" />
     </language>
     <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext">
       <concept id="2557074442922380897" name="de.slisson.mps.richtext.structure.Text" flags="ng" index="19SGf9">
@@ -108,7 +108,7 @@
       <concept id="5185579450379471862" name="com.mbeddr.doc.structure.StringTableCell" flags="ng" index="1xAuFZ">
         <property id="5185579450379471864" name="text" index="1xAuFL" />
       </concept>
-      <concept id="5185579450379273118" name="com.mbeddr.doc.structure.TextParHeader" flags="ng" index="1xAIan">
+      <concept id="5185579450379273118" name="com.mbeddr.doc.structure.TextParagraphHeader" flags="ng" index="1xAIan">
         <property id="5185579450379273119" name="text" index="1xAIam" />
       </concept>
       <concept id="6955693250238922827" name="com.mbeddr.doc.structure.ModelContentAsImageParagraph" flags="ng" index="3z_lpz">
@@ -202,8 +202,8 @@
       </concept>
     </language>
     <language id="1c5b7d51-0ef3-4332-af36-874466950878" name="com.mbeddr.doc.expressions">
-      <concept id="5378658552263149308" name="com.mbeddr.doc.expressions.structure.VariableDef" flags="ng" index="3XpXe8" />
-      <concept id="5378658552263151469" name="com.mbeddr.doc.expressions.structure.VarRef" flags="ng" index="3XpXCp">
+      <concept id="5378658552263149308" name="com.mbeddr.doc.expressions.structure.VariableDefinition" flags="ng" index="3XpXe8" />
+      <concept id="5378658552263151469" name="com.mbeddr.doc.expressions.structure.VariableReference" flags="ng" index="3XpXCp">
         <reference id="5378658552263151470" name="var" index="3XpXCq" />
       </concept>
       <concept id="5378658552263151447" name="com.mbeddr.doc.expressions.structure.Equation" flags="ng" index="3XpXCz">
diff --git a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.markdown.sandbox/models/com.mbeddr.doc.markdown.sandbox.doc2markdown.mps b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.markdown.sandbox/models/com.mbeddr.doc.markdown.sandbox.doc2markdown.mps
index b4eb518b295..e1c6af4e6fe 100644
--- a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.markdown.sandbox/models/com.mbeddr.doc.markdown.sandbox.doc2markdown.mps
+++ b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.markdown.sandbox/models/com.mbeddr.doc.markdown.sandbox.doc2markdown.mps
@@ -93,7 +93,7 @@
       <concept id="6955693250238922838" name="com.mbeddr.doc.structure.ModelContentRefWord" flags="ng" index="3z_lpY">
         <child id="6955693250238922839" name="modelContentPtr" index="3z_lpZ" />
       </concept>
-      <concept id="3350625596580269173" name="com.mbeddr.doc.structure.NullRenderer" flags="ng" index="1_05Lf" />
+      <concept id="3350625596580269173" name="com.mbeddr.doc.structure.NoOutputRenderer" flags="ng" index="1_05Lf" />
       <concept id="3350625596580256366" name="com.mbeddr.doc.structure.DocumentExport" flags="ng" index="1_08Dk">
         <property id="126932837435324910" name="title" index="WqcPg" />
       </concept>
diff --git a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.slides.sandbox/com.mbeddr.doc.slides.sandbox.msd b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.slides.sandbox/com.mbeddr.doc.slides.sandbox.msd
index d044160445e..07792fe96da 100644
--- a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.slides.sandbox/com.mbeddr.doc.slides.sandbox.msd
+++ b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.slides.sandbox/com.mbeddr.doc.slides.sandbox.msd
@@ -31,6 +31,7 @@
     <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/com.mbeddr.doc.test.documents.chapter_refs.mps b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/com.mbeddr.doc.test.documents.chapter_refs.mps
index 6baa2282a35..8086f9b3ff9 100644
--- a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/com.mbeddr.doc.test.documents.chapter_refs.mps
+++ b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/com.mbeddr.doc.test.documents.chapter_refs.mps
@@ -9,7 +9,7 @@
   <registry>
     <language id="2dec0852-3a21-4c4e-a68c-b05236cc37f2" name="com.mbeddr.doc.gen_xhtml">
       <concept id="3350625596580275037" name="com.mbeddr.doc.gen_xhtml.structure.HTMLRenderer" flags="ng" index="1_07dB" />
-      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLDummyRenderer" flags="ng" index="1TaS0h" />
+      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLNoOutputRenderer" flags="ng" index="1TaS0h" />
     </language>
     <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext">
       <concept id="2557074442922380897" name="de.slisson.mps.richtext.structure.Text" flags="ng" index="19SGf9">
diff --git a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/com.mbeddr.doc.test.documents.doc_refs.mps b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/com.mbeddr.doc.test.documents.doc_refs.mps
index 2729d1bb675..3a6dc4c613a 100644
--- a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/com.mbeddr.doc.test.documents.doc_refs.mps
+++ b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/com.mbeddr.doc.test.documents.doc_refs.mps
@@ -10,7 +10,7 @@
   <registry>
     <language id="2dec0852-3a21-4c4e-a68c-b05236cc37f2" name="com.mbeddr.doc.gen_xhtml">
       <concept id="3350625596580275037" name="com.mbeddr.doc.gen_xhtml.structure.HTMLRenderer" flags="ng" index="1_07dB" />
-      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLDummyRenderer" flags="ng" index="1TaS0h" />
+      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLNoOutputRenderer" flags="ng" index="1TaS0h" />
     </language>
     <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext">
       <concept id="2557074442922380897" name="de.slisson.mps.richtext.structure.Text" flags="ng" index="19SGf9">
diff --git a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/com.mbeddr.doc.test.documents.meta.mps b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/com.mbeddr.doc.test.documents.meta.mps
index 2b46d92b6af..f1b02ec4ed6 100644
--- a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/com.mbeddr.doc.test.documents.meta.mps
+++ b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/com.mbeddr.doc.test.documents.meta.mps
@@ -12,7 +12,7 @@
   <registry>
     <language id="2dec0852-3a21-4c4e-a68c-b05236cc37f2" name="com.mbeddr.doc.gen_xhtml">
       <concept id="3350625596580275037" name="com.mbeddr.doc.gen_xhtml.structure.HTMLRenderer" flags="ng" index="1_07dB" />
-      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLDummyRenderer" flags="ng" index="1TaS0h" />
+      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLNoOutputRenderer" flags="ng" index="1TaS0h" />
     </language>
     <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext">
       <concept id="2557074442922380897" name="de.slisson.mps.richtext.structure.Text" flags="ng" index="19SGf9">
diff --git a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/com.mbeddr.doc.test.documents.transitiveIncludes.mps b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/com.mbeddr.doc.test.documents.transitiveIncludes.mps
index 0a762f24e34..e142ad9db2f 100644
--- a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/com.mbeddr.doc.test.documents.transitiveIncludes.mps
+++ b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/com.mbeddr.doc.test.documents.transitiveIncludes.mps
@@ -12,7 +12,7 @@
   <registry>
     <language id="2dec0852-3a21-4c4e-a68c-b05236cc37f2" name="com.mbeddr.doc.gen_xhtml">
       <concept id="3350625596580275037" name="com.mbeddr.doc.gen_xhtml.structure.HTMLRenderer" flags="ng" index="1_07dB" />
-      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLDummyRenderer" flags="ng" index="1TaS0h" />
+      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLNoOutputRenderer" flags="ng" index="1TaS0h" />
     </language>
     <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext">
       <concept id="2557074442922380897" name="de.slisson.mps.richtext.structure.Text" flags="ng" index="19SGf9">
diff --git a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/doc1.mps b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/doc1.mps
index 8b338224a6c..58af9adbd7b 100644
--- a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/doc1.mps
+++ b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/doc1.mps
@@ -12,7 +12,7 @@
   <registry>
     <language id="2dec0852-3a21-4c4e-a68c-b05236cc37f2" name="com.mbeddr.doc.gen_xhtml">
       <concept id="3350625596580275037" name="com.mbeddr.doc.gen_xhtml.structure.HTMLRenderer" flags="ng" index="1_07dB" />
-      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLDummyRenderer" flags="ng" index="1TaS0h" />
+      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLNoOutputRenderer" flags="ng" index="1TaS0h" />
     </language>
     <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext">
       <concept id="2557074442922380897" name="de.slisson.mps.richtext.structure.Text" flags="ng" index="19SGf9">
diff --git a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/doc2.mps b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/doc2.mps
index 28399deed10..b07957c2603 100644
--- a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/doc2.mps
+++ b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/doc2.mps
@@ -12,7 +12,7 @@
   <registry>
     <language id="2dec0852-3a21-4c4e-a68c-b05236cc37f2" name="com.mbeddr.doc.gen_xhtml">
       <concept id="3350625596580275037" name="com.mbeddr.doc.gen_xhtml.structure.HTMLRenderer" flags="ng" index="1_07dB" />
-      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLDummyRenderer" flags="ng" index="1TaS0h" />
+      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLNoOutputRenderer" flags="ng" index="1TaS0h" />
     </language>
     <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext">
       <concept id="2557074442922380897" name="de.slisson.mps.richtext.structure.Text" flags="ng" index="19SGf9">
diff --git a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/doc3.mps b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/doc3.mps
index 4e910a17dfc..34fd4102f6f 100644
--- a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/doc3.mps
+++ b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/models/doc3.mps
@@ -10,7 +10,7 @@
   <registry>
     <language id="2dec0852-3a21-4c4e-a68c-b05236cc37f2" name="com.mbeddr.doc.gen_xhtml">
       <concept id="3350625596580275037" name="com.mbeddr.doc.gen_xhtml.structure.HTMLRenderer" flags="ng" index="1_07dB" />
-      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLDummyRenderer" flags="ng" index="1TaS0h" />
+      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLNoOutputRenderer" flags="ng" index="1TaS0h" />
     </language>
     <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext">
       <concept id="2557074442922380897" name="de.slisson.mps.richtext.structure.Text" flags="ng" index="19SGf9">
diff --git a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.spreadsheat.sandbox/com.mbeddr.spreadsheat.sandbox.msd b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.spreadsheat.sandbox/com.mbeddr.spreadsheat.sandbox.msd
index c3a21cd5828..c55ff9588a0 100644
--- a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.spreadsheat.sandbox/com.mbeddr.spreadsheat.sandbox.msd
+++ b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.spreadsheat.sandbox/com.mbeddr.spreadsheat.sandbox.msd
@@ -24,6 +24,7 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/code/languages/com.mbeddr.ext/_spreferences/CodeReviewPreferences/module.msd b/code/languages/com.mbeddr.ext/_spreferences/CodeReviewPreferences/module.msd
index dc9e8ba6e1a..d0e11a94419 100644
--- a/code/languages/com.mbeddr.ext/_spreferences/CodeReviewPreferences/module.msd
+++ b/code/languages/com.mbeddr.ext/_spreferences/CodeReviewPreferences/module.msd
@@ -24,6 +24,7 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/components.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/components.mpl
index 68190ade138..4f98d787184 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/components.mpl
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/components.mpl
@@ -145,7 +145,7 @@
     <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
     <language slang="l:b4d28e19-7d2d-47e9-943e-3a41f97a0e52:com.mbeddr.mpsutil.plantuml.node" version="0" />
     <language slang="l:1919c723-b60b-4592-9318-9ce96d91da44:de.itemis.mps.editor.celllayout" version="0" />
-    <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="0" />
+    <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="1" />
     <language slang="l:21063c66-85ba-4e98-839b-036445b17ae2:de.itemis.mps.editor.layout" version="0" />
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/editor.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/editor.mps
index 168ba8bba10..56ec2e1f4ce 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/languageModels/editor.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
     <use id="120e1c9d-4e27-4478-b2af-b2c3bd3850b0" name="com.mbeddr.mpsutil.editor.querylist" version="-1" />
-    <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="-1" />
+    <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="1" />
     <use id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells" version="2" />
     <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="-1" />
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/compositecomponents.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/compositecomponents.mpl
index 56a4e4fb1bf..04d30b7618e 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/compositecomponents.mpl
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/compositecomponents.mpl
@@ -155,7 +155,7 @@
   <languageVersions>
     <language slang="l:120e1c9d-4e27-4478-b2af-b2c3bd3850b0:com.mbeddr.mpsutil.editor.querylist" version="0" />
     <language slang="l:b92f861d-0184-446d-b88b-6dcf0e070241:com.mbeddr.mpsutil.intentions" version="0" />
-    <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="0" />
+    <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="1" />
     <language slang="l:21063c66-85ba-4e98-839b-036445b17ae2:de.itemis.mps.editor.layout" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/languageModels/editor.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/languageModels/editor.mps
index bca043186b4..d043c3a0f03 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/languageModels/editor.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
-    <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="-1" />
+    <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="1" />
     <use id="120e1c9d-4e27-4478-b2af-b2c3bd3850b0" name="com.mbeddr.mpsutil.editor.querylist" version="-1" />
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
     <use id="b1ab8c10-c118-4755-bf2a-cebab35cf533" name="jetbrains.mps.lang.editor.tooltips" version="0" />
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/editor.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/editor.mps
index 85674e00868..0b08a143dff 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/languageModels/editor.mps
@@ -5,7 +5,7 @@
     <use id="7e450f4e-1ac3-41ef-a851-4598161bdb94" name="de.slisson.mps.tables" version="0" />
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
     <use id="120e1c9d-4e27-4478-b2af-b2c3bd3850b0" name="com.mbeddr.mpsutil.editor.querylist" version="0" />
-    <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="0" />
+    <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="1" />
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
     <use id="1919c723-b60b-4592-9318-9ce96d91da44" name="de.itemis.mps.editor.celllayout" version="0" />
     <use id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells" version="2" />
diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/statemachines.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/statemachines.mpl
index 1eb02e00a70..1202b6fdbe6 100644
--- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/statemachines.mpl
+++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/statemachines.mpl
@@ -191,7 +191,7 @@
     <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
     <language slang="l:b4d28e19-7d2d-47e9-943e-3a41f97a0e52:com.mbeddr.mpsutil.plantuml.node" version="0" />
     <language slang="l:1919c723-b60b-4592-9318-9ce96d91da44:de.itemis.mps.editor.celllayout" version="0" />
-    <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="0" />
+    <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="1" />
     <language slang="l:21063c66-85ba-4e98-839b-036445b17ae2:de.itemis.mps.editor.layout" version="0" />
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:7e450f4e-1ac3-41ef-a851-4598161bdb94:de.slisson.mps.tables" version="0" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/components.msd b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/components.msd
index c68857d5fee..df8efdc329d 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/components.msd
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/components.msd
@@ -51,7 +51,7 @@
     <language slang="l:c788b046-2019-4656-8b60-8bb9bbb177b5:com.mbeddr.mpsutil.review" version="0" />
     <language slang="l:7a060fae-09e0-4372-be36-6696d6554c0e:com.mbeddr.mpsutil.review.annotation" version="0" />
     <language slang="l:c1c2a88a-323c-4605-a37d-9ab77a2ccbd2:com.mbeddr.mpsutil.suppresswarning" version="0" />
-    <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="0" />
+    <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="1" />
     <language slang="l:8ca79d43-eb45-4791-bdd4-0d6130ff895b:de.itemis.mps.editor.diagram.layout" version="0" />
     <language slang="l:21063c66-85ba-4e98-839b-036445b17ae2:de.itemis.mps.editor.layout" version="0" />
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/multipleInstancesStaticWiring@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/multipleInstancesStaticWiring@tests.mps
index 129df8cbc48..44b88f5834b 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/multipleInstancesStaticWiring@tests.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/models/test/ex/ext/components/multipleInstancesStaticWiring@tests.mps
@@ -148,7 +148,7 @@
         <property id="6720495385597071502" name="bounds_y" index="gqqTW" />
         <property id="6720495385597071503" name="bounds_width" index="gqqTX" />
         <property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
-        <property id="4583510071007917016" name="transform" index="TgtnS" />
+        <property id="4583510071007917016" name="portTransform" index="TgtnS" />
         <child id="738815095926774816" name="portLayouts" index="1pap1a" />
       </concept>
       <concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/compositecomponents.msd b/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/compositecomponents.msd
index 89c429bb18a..c2982a4e0b7 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/compositecomponents.msd
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/compositecomponents.msd
@@ -48,7 +48,7 @@
     <language slang="l:c788b046-2019-4656-8b60-8bb9bbb177b5:com.mbeddr.mpsutil.review" version="0" />
     <language slang="l:7a060fae-09e0-4372-be36-6696d6554c0e:com.mbeddr.mpsutil.review.annotation" version="0" />
     <language slang="l:c1c2a88a-323c-4605-a37d-9ab77a2ccbd2:com.mbeddr.mpsutil.suppresswarning" version="0" />
-    <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="0" />
+    <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="1" />
     <language slang="l:8ca79d43-eb45-4791-bdd4-0d6130ff895b:de.itemis.mps.editor.diagram.layout" version="0" />
     <language slang="l:21063c66-85ba-4e98-839b-036445b17ae2:de.itemis.mps.editor.layout" version="0" />
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/models/test/ex/ext/compositeComponents/helloWorld.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/models/test/ex/ext/compositeComponents/helloWorld.mps
index 86e0d7fa573..3523af381c5 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/models/test/ex/ext/compositeComponents/helloWorld.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/models/test/ex/ext/compositeComponents/helloWorld.mps
@@ -136,7 +136,7 @@
         <property id="6720495385597071502" name="bounds_y" index="gqqTW" />
         <property id="6720495385597071503" name="bounds_width" index="gqqTX" />
         <property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
-        <property id="4583510071007917016" name="transform" index="TgtnS" />
+        <property id="4583510071007917016" name="portTransform" index="TgtnS" />
         <child id="738815095926774816" name="portLayouts" index="1pap1a" />
       </concept>
       <concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
diff --git a/code/languages/com.mbeddr.ext/tests/test.ext.components.nodes_tracing/models/components_code.mps b/code/languages/com.mbeddr.ext/tests/test.ext.components.nodes_tracing/models/components_code.mps
index a6b8d87d900..83f7c90cf2d 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ext.components.nodes_tracing/models/components_code.mps
+++ b/code/languages/com.mbeddr.ext/tests/test.ext.components.nodes_tracing/models/components_code.mps
@@ -155,7 +155,7 @@
         <property id="6720495385597071502" name="bounds_y" index="gqqTW" />
         <property id="6720495385597071503" name="bounds_width" index="gqqTX" />
         <property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
-        <property id="4583510071007917016" name="transform" index="TgtnS" />
+        <property id="4583510071007917016" name="portTransform" index="TgtnS" />
         <child id="738815095926774816" name="portLayouts" index="1pap1a" />
       </concept>
       <concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
diff --git a/code/languages/com.mbeddr.ext/tests/test.ext.components.nodes_tracing/test.ext.components.nodes_tracing.msd b/code/languages/com.mbeddr.ext/tests/test.ext.components.nodes_tracing/test.ext.components.nodes_tracing.msd
index 83da439a7ae..0058dd6bcb5 100644
--- a/code/languages/com.mbeddr.ext/tests/test.ext.components.nodes_tracing/test.ext.components.nodes_tracing.msd
+++ b/code/languages/com.mbeddr.ext/tests/test.ext.components.nodes_tracing/test.ext.components.nodes_tracing.msd
@@ -51,7 +51,7 @@
     <language slang="l:c788b046-2019-4656-8b60-8bb9bbb177b5:com.mbeddr.mpsutil.review" version="0" />
     <language slang="l:7a060fae-09e0-4372-be36-6696d6554c0e:com.mbeddr.mpsutil.review.annotation" version="0" />
     <language slang="l:c1c2a88a-323c-4605-a37d-9ab77a2ccbd2:com.mbeddr.mpsutil.suppresswarning" version="0" />
-    <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="0" />
+    <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="1" />
     <language slang="l:8ca79d43-eb45-4791-bdd4-0d6130ff895b:de.itemis.mps.editor.diagram.layout" version="0" />
     <language slang="l:21063c66-85ba-4e98-839b-036445b17ae2:de.itemis.mps.editor.layout" version="0" />
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/com.mbeddr.demo.comparator.diff.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/com.mbeddr.demo.comparator.diff.mpl
index 912737708d0..8a160574beb 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/com.mbeddr.demo.comparator.diff.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/com.mbeddr.demo.comparator.diff.mpl
@@ -25,7 +25,7 @@
       </facets>
       <external-templates />
       <languageVersions>
-        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
+        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
@@ -39,7 +39,7 @@
         <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="18" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
       </languageVersions>
@@ -57,7 +57,7 @@
   </generators>
   <sourcePath />
   <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
+    <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="1" />
@@ -84,7 +84,7 @@
     <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="18" />
+    <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" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.behavior.mps
index c788c7224e2..5ecc1d8338a 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.behavior.mps
@@ -2,7 +2,7 @@
 <model ref="r:b8b41aa0-7274-4d9d-aa01-79655a007415(com.mbeddr.demo.comparator.diff.behavior)">
   <persistence version="9" />
   <languages>
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="18" />
+    <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>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl
index 1d30779d3dd..18845509b80 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl
@@ -52,23 +52,17 @@
         <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
         <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="5" />
+        <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="6" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
       </languageVersions>
       <dependencyVersions>
         <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
-        <module reference="847a3235-09f9-403c-b6a9-1c294a212e92(Ant)" version="0" />
         <module reference="1fd846c3-c5f9-4b9e-9ecc-e716f7149f86(Hamcrest)" 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="920eaa0e-ecca-46bc-bee7-4e5c59213dd6(Testbench)" version="0" />
-        <module reference="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" version="0" />
-        <module reference="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" version="0" />
         <module reference="c6420b75-4569-420d-aaf7-9bc590ad7b2a(com.mbeddr.mpsutil.comparator)" version="0" />
         <module reference="f47b95d4-5e73-4c04-9204-18076950153b(com.mbeddr.mpsutil.compare)" version="0" />
         <module reference="3b21f776-9e24-4e37-9639-70bded433068(com.mbeddr.mpsutil.compare#756135271275941091)" version="0" />
@@ -80,14 +74,12 @@
         <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
         <module reference="f61473f9-130f-42f6-b98d-6c438812c2f6(jetbrains.mps.baseLanguage.unitTest)" version="0" />
         <module reference="83f155ff-422c-4b5a-a2f2-b459302dd215(jetbrains.mps.baseLanguage.unitTest.libs)" version="0" />
-        <module reference="fdaaf35f-8ee3-4c37-b09d-9efaeaaa7a41(jetbrains.mps.core.tool.environment)" version="0" />
         <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+        <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
         <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
         <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
         <module reference="8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)" version="0" />
-        <module reference="e55e6749-03cb-4ea7-9695-2322bab791c1(jetbrains.mps.lang.test.matcher)" version="0" />
-        <module reference="707c4fde-f79a-44b5-b3d7-b5cef8844ccf(jetbrains.mps.lang.test.runtime)" version="0" />
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps
index 91f44f98346..53dfb4cea2d 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps
@@ -5,7 +5,7 @@
     <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="4" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="2" />
-    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram.sandbox/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram.sandbox/languageModels/structure.mps
index 18735fd5f97..15947881c56 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram.sandbox/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram.sandbox/languageModels/structure.mps
@@ -78,7 +78,7 @@
         <property id="6720495385597071502" name="bounds_y" index="gqqTW" />
         <property id="6720495385597071503" name="bounds_width" index="gqqTX" />
         <property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
-        <property id="4583510071007917016" name="transform" index="TgtnS" />
+        <property id="4583510071007917016" name="portTransform" index="TgtnS" />
         <child id="738815095926774816" name="portLayouts" index="1pap1a" />
       </concept>
       <concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/com.mbeddr.mpsutil.conceptdiagram.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/com.mbeddr.mpsutil.conceptdiagram.mpl
index d390334fea9..04bf09147f2 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/com.mbeddr.mpsutil.conceptdiagram.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/com.mbeddr.mpsutil.conceptdiagram.mpl
@@ -21,7 +21,7 @@
     <dependency reexport="false">7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="0" />
+    <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="1" />
     <language slang="l:21063c66-85ba-4e98-839b-036445b17ae2:de.itemis.mps.editor.layout" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/editor.mps
index 0695999438b..ef7c048acb4 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:f4f9cb22-513c-4c2a-bf03-5ba144f465a9(com.mbeddr.mpsutil.conceptdiagram.editor)">
   <persistence version="9" />
   <languages>
-    <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="0" />
+    <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="1" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dependenciesdiagram/com.mbeddr.mpsutil.dependenciesdiagram.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dependenciesdiagram/com.mbeddr.mpsutil.dependenciesdiagram.mpl
index f09e0928c82..16bf1291ed5 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dependenciesdiagram/com.mbeddr.mpsutil.dependenciesdiagram.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dependenciesdiagram/com.mbeddr.mpsutil.dependenciesdiagram.mpl
@@ -29,7 +29,7 @@
   <languageVersions>
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:9d1cb9f8-2ae0-4895-91c8-ff32e8afc27d:com.mbeddr.mpsutil.conceptdiagram" version="0" />
-    <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="0" />
+    <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="1" />
     <language slang="l:21063c66-85ba-4e98-839b-036445b17ae2:de.itemis.mps.editor.layout" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dependenciesdiagram/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dependenciesdiagram/languageModels/editor.mps
index f5cf0ddff8e..9e55cfaca47 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dependenciesdiagram/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dependenciesdiagram/languageModels/editor.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="9d1cb9f8-2ae0-4895-91c8-ff32e8afc27d" name="com.mbeddr.mpsutil.conceptdiagram" version="0" />
-    <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="0" />
+    <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="1" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="0" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/util.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/util.mps
index 4044f8c3214..a3d43094267 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/util.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/util.mps
@@ -3682,7 +3682,7 @@
                       </node>
                     </node>
                     <node concept="37vLTw" id="9jWrhFiGOr" role="37vLTJ">
-                      <ref role="3cqZAo" node="9jWrhFiBB7" resolve="supplier" />
+                      <ref role="3cqZAo" node="9jWrhFiBB7" resolve="innerSupplier" />
                     </node>
                   </node>
                 </node>
@@ -3696,7 +3696,7 @@
             <node concept="2OqwBi" id="9jWrhFiD1Z" role="37vLTJ">
               <node concept="Xjq3P" id="9jWrhFiCJ0" role="2Oq$k0" />
               <node concept="2OwXpG" id="9jWrhFiD_8" role="2OqNvi">
-                <ref role="2Oxat5" node="9jWrhFiBB7" resolve="supplier" />
+                <ref role="2Oxat5" node="9jWrhFiBB7" resolve="innerSupplier" />
               </node>
             </node>
           </node>
@@ -3732,13 +3732,13 @@
         <node concept="3clFbF" id="9jWrhFiJg9" role="3cqZAp">
           <node concept="2Sg_IR" id="9jWrhFiJtA" role="3clFbG">
             <node concept="37vLTw" id="9jWrhFiJtB" role="2SgG2M">
-              <ref role="3cqZAo" node="9jWrhFiBB7" resolve="supplier" />
+              <ref role="3cqZAo" node="9jWrhFiBB7" resolve="innerSupplier" />
             </node>
           </node>
         </node>
       </node>
       <node concept="2AHcQZ" id="9jWrhFiB10" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="3UR2Jj" id="9jWrhFm7uv" role="lGtFl">
@@ -3894,7 +3894,7 @@
             <node concept="2OqwBi" id="9jWrhFiXur" role="37vLTJ">
               <node concept="Xjq3P" id="9jWrhFiXus" role="2Oq$k0" />
               <node concept="2OwXpG" id="9jWrhFiXut" role="2OqNvi">
-                <ref role="2Oxat5" node="9jWrhFiXu0" resolve="supplier" />
+                <ref role="2Oxat5" node="9jWrhFiXu0" resolve="innerSupplier" />
               </node>
             </node>
           </node>
@@ -4118,13 +4118,13 @@
         <node concept="3clFbF" id="9jWrhFiXuE" role="3cqZAp">
           <node concept="2Sg_IR" id="9jWrhFiXuF" role="3clFbG">
             <node concept="37vLTw" id="9jWrhFiXuG" role="2SgG2M">
-              <ref role="3cqZAo" node="9jWrhFiXu0" resolve="supplier" />
+              <ref role="3cqZAo" node="9jWrhFiXu0" resolve="innerSupplier" />
             </node>
           </node>
         </node>
       </node>
       <node concept="2AHcQZ" id="9jWrhFiXuH" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="3UR2Jj" id="9jWrhFm84N" role="lGtFl">
@@ -4239,7 +4239,7 @@
             <node concept="1rXfSq" id="5Hb7SE2mZSt" role="2Oq$k0">
               <ref role="37wK5l" node="5Hb7SE2mAo$" resolve="create" />
               <node concept="37vLTw" id="5Hb7SE2n0qo" role="37wK5m">
-                <ref role="3cqZAo" node="5Hb7SE2mUup" resolve="visit" />
+                <ref role="3cqZAo" node="5Hb7SE2mUup" resolve="finishNow" />
               </node>
               <node concept="37vLTw" id="5Hb7SE2n1hZ" role="37wK5m">
                 <ref role="3cqZAo" node="5Hb7SE2mUut" resolve="successors" />
@@ -4248,7 +4248,7 @@
             <node concept="liA8E" id="5Hb7SE2n2aK" role="2OqNvi">
               <ref role="37wK5l" node="5Hb7SE23SD3" resolve="doBreadthFirst" />
               <node concept="37vLTw" id="5Hb7SE2n3ai" role="37wK5m">
-                <ref role="3cqZAo" node="5Hb7SE2mUum" resolve="startNodes" />
+                <ref role="3cqZAo" node="5Hb7SE2mUum" resolve="startNode" />
               </node>
             </node>
           </node>
@@ -4335,14 +4335,14 @@
             <node concept="1rXfSq" id="5Hb7SE2n3_o" role="2Oq$k0">
               <ref role="37wK5l" node="5Hb7SE2mAo$" resolve="create" />
               <node concept="37vLTw" id="5Hb7SE2n3_p" role="37wK5m">
-                <ref role="3cqZAo" node="5Hb7SE2n3_c" resolve="visit" />
+                <ref role="3cqZAo" node="5Hb7SE2n3_c" resolve="finishNow" />
               </node>
               <node concept="37vLTw" id="5Hb7SE2n3_q" role="37wK5m">
                 <ref role="3cqZAo" node="5Hb7SE2n3_g" resolve="successors" />
               </node>
             </node>
             <node concept="liA8E" id="5Hb7SE2n3_r" role="2OqNvi">
-              <ref role="37wK5l" node="5Hb7SE23LnD" resolve="doBreadthFirst1" />
+              <ref role="37wK5l" node="5Hb7SE23LnD" resolve="doBreadthFirst" />
               <node concept="37vLTw" id="5Hb7SE2n3_s" role="37wK5m">
                 <ref role="3cqZAo" node="5Hb7SE2n3_9" resolve="startNodes" />
               </node>
@@ -4424,7 +4424,7 @@
               <node concept="1Y3b0j" id="5Hb7SE2mIpt" role="YeSDq">
                 <property role="2bfB8j" value="true" />
                 <property role="373rjd" value="true" />
-                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
+                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                 <ref role="1Y3XeK" node="5Hb7SE23e8T" resolve="Traversal" />
                 <node concept="3Tm1VV" id="5Hb7SE2mIpu" role="1B3o_S" />
                 <node concept="16syzq" id="5Hb7SE2mI4$" role="2Ghqu4">
@@ -4444,7 +4444,7 @@
                     <node concept="3clFbF" id="5Hb7SE2mJks" role="3cqZAp">
                       <node concept="2Sg_IR" id="5Hb7SE2mP4a" role="3clFbG">
                         <node concept="37vLTw" id="5Hb7SE2mP4b" role="2SgG2M">
-                          <ref role="3cqZAo" node="5Hb7SE2mD42" resolve="visit" />
+                          <ref role="3cqZAo" node="5Hb7SE2mD42" resolve="finishNowFunc" />
                         </node>
                         <node concept="37vLTw" id="5Hb7SE2mPGE" role="2SgHGx">
                           <ref role="3cqZAo" node="5Hb7SE2mJkk" resolve="n" />
@@ -4453,7 +4453,7 @@
                     </node>
                   </node>
                   <node concept="2AHcQZ" id="5Hb7SE2mJkq" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" />
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                 </node>
                 <node concept="3clFb_" id="5Hb7SE2mJkt" role="jymVt">
@@ -4474,7 +4474,7 @@
                     <node concept="3clFbF" id="5Hb7SE2mT0L" role="3cqZAp">
                       <node concept="2Sg_IR" id="5Hb7SE2mTr8" role="3clFbG">
                         <node concept="37vLTw" id="5Hb7SE2mTr9" role="2SgG2M">
-                          <ref role="3cqZAo" node="5Hb7SE2mD_U" resolve="successors" />
+                          <ref role="3cqZAo" node="5Hb7SE2mD_U" resolve="successorsFunc" />
                         </node>
                         <node concept="37vLTw" id="5Hb7SE2mUeH" role="2SgHGx">
                           <ref role="3cqZAo" node="5Hb7SE2mJky" resolve="n" />
@@ -4483,7 +4483,7 @@
                     </node>
                   </node>
                   <node concept="2AHcQZ" id="5Hb7SE2mJkD" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" />
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                   </node>
                 </node>
               </node>
@@ -4650,7 +4650,7 @@
               </node>
             </node>
             <node concept="liA8E" id="1BQevbVT1qI" role="2OqNvi">
-              <ref role="37wK5l" node="5Hb7SE23LnD" resolve="doBreadthFirst1" />
+              <ref role="37wK5l" node="5Hb7SE23LnD" resolve="doBreadthFirst" />
               <node concept="37vLTw" id="1BQevbVT1qJ" role="37wK5m">
                 <ref role="3cqZAo" node="1BQevbVT1qs" resolve="startNodes" />
               </node>
@@ -4955,7 +4955,7 @@
                     </node>
                     <node concept="TSZUe" id="1YEBaqBGnXH" role="2OqNvi">
                       <node concept="37vLTw" id="1YEBaqBGoXj" role="25WWJ7">
-                        <ref role="3cqZAo" node="1YEBaqBFUrt" resolve="vc" />
+                        <ref role="3cqZAo" node="1YEBaqBFUrt" resolve="item" />
                       </node>
                     </node>
                   </node>
@@ -4986,7 +4986,7 @@
                       </node>
                     </node>
                     <node concept="1rXfSq" id="5Hb7SE24NBp" role="33vP2m">
-                      <ref role="37wK5l" node="5Hb7SE24D9s" resolve="successors" />
+                      <ref role="37wK5l" node="5Hb7SE24D9s" resolve="successorsOf" />
                       <node concept="37vLTw" id="5Hb7SE24NBq" role="37wK5m">
                         <ref role="3cqZAo" node="1YEBaqBFUrt" resolve="item" />
                       </node>
@@ -5013,7 +5013,7 @@
                   </node>
                   <node concept="3JPx81" id="1YEBaqBGjFe" role="2OqNvi">
                     <node concept="37vLTw" id="1YEBaqBGjFf" role="25WWJ7">
-                      <ref role="3cqZAo" node="1YEBaqBFUrt" resolve="vc" />
+                      <ref role="3cqZAo" node="1YEBaqBFUrt" resolve="item" />
                     </node>
                   </node>
                 </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.genplan/com.mbeddr.mpsutil.comparator.diff.demo.genplan.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.genplan/com.mbeddr.mpsutil.comparator.diff.demo.genplan.msd
index edd8c2d476b..9ff270b49ae 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.genplan/com.mbeddr.mpsutil.comparator.diff.demo.genplan.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.genplan/com.mbeddr.mpsutil.comparator.diff.demo.genplan.msd
@@ -20,3 +20,4 @@
     <module reference="a83addf6-6ea9-4504-83d6-0211dab89b0f(com.mbeddr.mpsutil.comparator.diff.demo.genplan)" version="0" />
   </dependencyVersions>
 </solution>
+
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/com.mbeddr.mpsutil.comparator.diff.demo.tests.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/com.mbeddr.mpsutil.comparator.diff.demo.tests.msd
index 877fcccd752..c7988183fab 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/com.mbeddr.mpsutil.comparator.diff.demo.tests.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/com.mbeddr.mpsutil.comparator.diff.demo.tests.msd
@@ -27,7 +27,7 @@
   <languageVersions>
     <language slang="l:e0989c7a-8149-4be7-97b6-0b78561af099:com.mbeddr.demo.comparator.diff" version="0" />
     <language slang="l:f47b95d4-5e73-4c04-9204-18076950153b:com.mbeddr.mpsutil.compare" version="0" />
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
+    <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="1" />
@@ -36,8 +36,8 @@
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="18" />
-    <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="5" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
+    <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="6" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps
index ff421494eff..679ae0e1f59 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps
@@ -2,13 +2,13 @@
 <model ref="r:7e1cdbc4-24e4-458b-b337-9e688e689139(com.mbeddr.demo.compafator.diff.tests.diffs@tests)">
   <persistence version="9" />
   <languages>
-    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
     <use id="479c7a8c-02f9-43b5-9139-d910cb22f298" name="jetbrains.mps.core.xml" version="0" />
     <use id="f47b95d4-5e73-4c04-9204-18076950153b" name="com.mbeddr.mpsutil.compare" version="0" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="18" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
@@ -38,6 +38,7 @@
       <concept id="1225467090849" name="jetbrains.mps.lang.test.structure.ProjectExpression" flags="nn" index="1jxXqW" />
       <concept id="1225469856668" name="jetbrains.mps.lang.test.structure.ModelExpression" flags="nn" index="1jGwE1" />
       <concept id="1216913645126" name="jetbrains.mps.lang.test.structure.NodesTestCase" flags="lg" index="1lH9Xt">
+        <property id="2616911529524314943" name="accessMode" index="3DII0k" />
         <child id="1216993439383" name="methods" index="1qtyYc" />
         <child id="1217501822150" name="nodesToCheck" index="1SKRRt" />
         <child id="1217501895093" name="testMethods" index="1SL9yI" />
@@ -264,6 +265,7 @@
   </registry>
   <node concept="1lH9Xt" id="6Qumy0DUPjd">
     <property role="TrG5h" value="ShowDiff" />
+    <property role="3DII0k" value="2hh8MJdVwqX/command" />
     <node concept="2XrIbr" id="2RIzFJ7FNYX" role="1qtyYc">
       <property role="TrG5h" value="expected" />
       <node concept="3Tqbb2" id="2RIzFJ7FNZ9" role="3clF45" />
@@ -711,7 +713,7 @@
             <node concept="2OqwBi" id="3j0GERRScPF" role="3fr31v">
               <node concept="2WthIp" id="3j0GERRScPI" role="2Oq$k0" />
               <node concept="2XshWL" id="3j0GERRScPK" role="2OqNvi">
-                <ref role="2WH_rO" node="3j0GERRSceI" resolve="testsEnabled" />
+                <ref role="2WH_rO" node="3j0GERRSceI" resolve="areTestsEnabled" />
               </node>
             </node>
           </node>
@@ -742,7 +744,7 @@
             <node concept="2OqwBi" id="3iWn33UB3g" role="3fr31v">
               <node concept="2WthIp" id="3iWn33UB3h" role="2Oq$k0" />
               <node concept="2XshWL" id="3iWn33UB3i" role="2OqNvi">
-                <ref role="2WH_rO" node="3j0GERRSceI" resolve="testsEnabled" />
+                <ref role="2WH_rO" node="3j0GERRSceI" resolve="areTestsEnabled" />
               </node>
             </node>
           </node>
@@ -777,7 +779,7 @@
             <node concept="2OqwBi" id="3j0GERRSd15" role="3fr31v">
               <node concept="2WthIp" id="3j0GERRSd16" role="2Oq$k0" />
               <node concept="2XshWL" id="3j0GERRSd17" role="2OqNvi">
-                <ref role="2WH_rO" node="3j0GERRSceI" resolve="testsEnabled" />
+                <ref role="2WH_rO" node="3j0GERRSceI" resolve="areTestsEnabled" />
               </node>
             </node>
           </node>
@@ -808,7 +810,7 @@
             <node concept="2OqwBi" id="3j0GERRSde6" role="3fr31v">
               <node concept="2WthIp" id="3j0GERRSde7" role="2Oq$k0" />
               <node concept="2XshWL" id="3j0GERRSde8" role="2OqNvi">
-                <ref role="2WH_rO" node="3j0GERRSceI" resolve="testsEnabled" />
+                <ref role="2WH_rO" node="3j0GERRSceI" resolve="areTestsEnabled" />
               </node>
             </node>
           </node>
@@ -836,7 +838,7 @@
             <node concept="2OqwBi" id="3j0GERRSdp_" role="3fr31v">
               <node concept="2WthIp" id="3j0GERRSdpA" role="2Oq$k0" />
               <node concept="2XshWL" id="3j0GERRSdpB" role="2OqNvi">
-                <ref role="2WH_rO" node="3j0GERRSceI" resolve="testsEnabled" />
+                <ref role="2WH_rO" node="3j0GERRSceI" resolve="areTestsEnabled" />
               </node>
             </node>
           </node>
@@ -867,7 +869,7 @@
             <node concept="2OqwBi" id="3j0GERRSj4o" role="3fr31v">
               <node concept="2WthIp" id="3j0GERRSj4p" role="2Oq$k0" />
               <node concept="2XshWL" id="3j0GERRSj4q" role="2OqNvi">
-                <ref role="2WH_rO" node="3j0GERRSceI" resolve="testsEnabled" />
+                <ref role="2WH_rO" node="3j0GERRSceI" resolve="areTestsEnabled" />
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr
index 47a1a65200b..f9798ef27a6 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr
@@ -11,7 +11,6 @@
     <import index="alof" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.project(MPS.Platform/)" implicit="true" />
     <import index="jkm4" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.ui(MPS.IDEA/)" implicit="true" />
     <import index="qjvf" ref="r:82cadfba-0fcc-402e-8eaa-37395d383fb6(com.mbeddr.mpsutil.compare.behavior)" implicit="true" />
-    <import index="z1c3" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" implicit="true" />
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" implicit="true" />
     <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" implicit="true" />
     <import index="tp5g" ref="r:00000000-0000-4000-0000-011c89590388(jetbrains.mps.lang.test.structure)" implicit="true" />
@@ -798,7 +797,7 @@
                                         <property role="Xl_RC" value="OK" />
                                       </node>
                                       <node concept="37vLTw" id="2u2KgtdmC0f" role="9lYEk">
-                                        <ref role="3cqZAo" node="3zBhpJM4Blc" resolve="mpsProject" />
+                                        <ref role="3cqZAo" node="3zBhpJM4Blc" resolve="project" />
                                       </node>
                                     </node>
                                     <node concept="1QHqEO" id="2u2KgtdluI1" role="3cqZAp">
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.dependenciesdiagram.sandbox/models/com/mbeddr/mpsutil/dependenciesdiagram/sandbox/test.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.dependenciesdiagram.sandbox/models/com/mbeddr/mpsutil/dependenciesdiagram/sandbox/test.mps
index 0ea6eff99ff..1884412dacd 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.dependenciesdiagram.sandbox/models/com/mbeddr/mpsutil/dependenciesdiagram/sandbox/test.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.dependenciesdiagram.sandbox/models/com/mbeddr/mpsutil/dependenciesdiagram/sandbox/test.mps
@@ -32,7 +32,7 @@
         <property id="6720495385597071502" name="bounds_y" index="gqqTW" />
         <property id="6720495385597071503" name="bounds_width" index="gqqTX" />
         <property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
-        <property id="4583510071007917016" name="transform" index="TgtnS" />
+        <property id="4583510071007917016" name="portTransform" index="TgtnS" />
       </concept>
       <concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
         <child id="2319506556913311101" name="anchors" index="2Vcluh" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodeaccess/com.mbeddr.mpsutil.nodeaccess.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodeaccess/com.mbeddr.mpsutil.nodeaccess.msd
index 618e9b2a2cb..37ca9cb7c40 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodeaccess/com.mbeddr.mpsutil.nodeaccess.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodeaccess/com.mbeddr.mpsutil.nodeaccess.msd
@@ -18,7 +18,7 @@
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">7f0984ac-9f5d-4001-9257-17f7d10f3fd5(com.mbeddr.mpsutil.httpsupport.rt)</dependency>
-    <dependency reexport="false">5454dbfd-2075-4de0-b85e-fa645eb6957e(com.mbeddr.mpsutil.serializer.xml)</dependency>
+    <dependency reexport="false">5454dbfd-2075-4de0-b85e-fa645eb6957e(de.itemis.mps.utils.serializer.xml)</dependency>
     <dependency reexport="false">5b1f863d-65a0-41a6-a801-33896be24202(jetbrains.mps.ide.editor)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="false">23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)</dependency>
@@ -51,7 +51,7 @@
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="7f0984ac-9f5d-4001-9257-17f7d10f3fd5(com.mbeddr.mpsutil.httpsupport.rt)" version="0" />
     <module reference="b6f172c1-d3af-40cd-a1c3-ef9952e306b3(com.mbeddr.mpsutil.nodeaccess)" version="0" />
-    <module reference="5454dbfd-2075-4de0-b85e-fa645eb6957e(com.mbeddr.mpsutil.serializer.xml)" version="0" />
+    <module reference="5454dbfd-2075-4de0-b85e-fa645eb6957e(de.itemis.mps.utils.serializer.xml)" version="0" />
     <module reference="5b1f863d-65a0-41a6-a801-33896be24202(jetbrains.mps.ide.editor)" version="0" />
     <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
     <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.toolrunner/com.mbeddr.mpsutil.toolrunner.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.toolrunner/com.mbeddr.mpsutil.toolrunner.msd
index 76a4febb2a4..7b91ad00216 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.toolrunner/com.mbeddr.mpsutil.toolrunner.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.toolrunner/com.mbeddr.mpsutil.toolrunner.msd
@@ -24,6 +24,8 @@
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <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" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.xmodel.actions/com.mbeddr.mpsutil.xmodel.actions.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.xmodel.actions/com.mbeddr.mpsutil.xmodel.actions.msd
index d6a9f4a6557..b6afc4d763d 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.xmodel.actions/com.mbeddr.mpsutil.xmodel.actions.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.xmodel.actions/com.mbeddr.mpsutil.xmodel.actions.msd
@@ -13,7 +13,7 @@
   <sourcePath />
   <dependencies>
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
-    <dependency reexport="false">c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1(de.slisson.mps.hacks.xmodelgen)</dependency>
+    <dependency reexport="false">c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1(de.itemis.mps.hacks.xmodelgen)</dependency>
     <dependency reexport="false">b401a680-8325-4110-8fd3-84331ff25bef(jetbrains.mps.lang.generator)</dependency>
     <dependency reexport="false">8f6725be-608d-433b-98fd-844f816eb05f(jetbrains.mps.ide.make)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
@@ -50,7 +50,7 @@
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="d7e4c61d-aebf-43c6-b4ad-ab5fbe958b0c(com.mbeddr.mpsutil.xmodel.actions)" version="0" />
-    <module reference="c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1(de.slisson.mps.hacks.xmodelgen)" version="0" />
+    <module reference="c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1(de.itemis.mps.hacks.xmodelgen)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
     <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/doc.com.mbeddr.mpsutil.multilingual/doc.com.mbeddr.mpsutil.multilingual.msd b/code/languages/com.mbeddr.mpsutil/solutions/doc.com.mbeddr.mpsutil.multilingual/doc.com.mbeddr.mpsutil.multilingual.msd
index 3ec43bddbc7..90b4037740c 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/doc.com.mbeddr.mpsutil.multilingual/doc.com.mbeddr.mpsutil.multilingual.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/doc.com.mbeddr.mpsutil.multilingual/doc.com.mbeddr.mpsutil.multilingual.msd
@@ -23,7 +23,7 @@
     <language slang="l:2374bc90-7e37-41f1-a9c4-c2e35194c36a:com.mbeddr.doc" version="4" />
     <language slang="l:f44f6b9a-bf30-4f73-866e-fac17c177409:com.mbeddr.doc.gen_latex" version="0" />
     <language slang="l:2dec0852-3a21-4c4e-a68c-b05236cc37f2:com.mbeddr.doc.gen_xhtml" version="1" />
-    <language slang="l:e06345c7-da82-4f8b-bd44-1425fe158640:com.mbeddr.doc.meta" version="0" />
+    <language slang="l:e06345c7-da82-4f8b-bd44-1425fe158640:com.mbeddr.doc.meta" version="1" />
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />
     <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
@@ -41,6 +41,7 @@
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:86ef8290-12bb-4ca7-947f-093788f263a9:jetbrains.mps.lang.project" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/doc.com.mbeddr.mpsutil.multilingual/models/doc/com/mbeddr/mpsutil/multilingual/docs.mps b/code/languages/com.mbeddr.mpsutil/solutions/doc.com.mbeddr.mpsutil.multilingual/models/doc/com/mbeddr/mpsutil/multilingual/docs.mps
index a78a165cdcc..9d35f22a895 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/doc.com.mbeddr.mpsutil.multilingual/models/doc/com/mbeddr/mpsutil/multilingual/docs.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/doc.com.mbeddr.mpsutil.multilingual/models/doc/com/mbeddr/mpsutil/multilingual/docs.mps
@@ -5,7 +5,7 @@
     <use id="2374bc90-7e37-41f1-a9c4-c2e35194c36a" name="com.mbeddr.doc" version="4" />
     <use id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base" version="6" />
     <use id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext" version="-1" />
-    <use id="e06345c7-da82-4f8b-bd44-1425fe158640" name="com.mbeddr.doc.meta" version="-1" />
+    <use id="e06345c7-da82-4f8b-bd44-1425fe158640" name="com.mbeddr.doc.meta" version="1" />
     <use id="86ef8290-12bb-4ca7-947f-093788f263a9" name="jetbrains.mps.lang.project" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="d2a1d976-43a2-462f-ac3a-9b258ced839d" name="com.mbeddr.mpsutil.multilingual.baseLanguage" version="-1" />
@@ -30,13 +30,7 @@
   </imports>
   <registry>
     <language id="2dec0852-3a21-4c4e-a68c-b05236cc37f2" name="com.mbeddr.doc.gen_xhtml">
-      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLDummyRenderer" flags="ng" index="1TaS0h" />
-    </language>
-    <language id="86ef8290-12bb-4ca7-947f-093788f263a9" name="jetbrains.mps.lang.project">
-      <concept id="1855399583446016268" name="jetbrains.mps.lang.project.structure.ModuleReference" flags="ng" index="A2Dkr">
-        <property id="1855399583446016270" name="qualifiedName" index="A2Dkp" />
-        <property id="1855399583446016269" name="uuid" index="A2Dkq" />
-      </concept>
+      <concept id="3498379661306969557" name="com.mbeddr.doc.gen_xhtml.structure.HTMLNoOutputRenderer" flags="ng" index="1TaS0h" />
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
@@ -258,6 +252,12 @@
         <property id="2711621784026951428" name="pointOnlyToExistingFile" index="1RwFax" />
       </concept>
     </language>
+    <language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
+      <concept id="361130699826193249" name="jetbrains.mps.lang.modelapi.structure.ModulePointer" flags="ng" index="1dCxOk">
+        <property id="1863527487546097500" name="moduleId" index="1XweGW" />
+        <property id="1863527487545993577" name="moduleName" index="1XxBO9" />
+      </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">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
@@ -280,7 +280,7 @@
     </language>
     <language id="e06345c7-da82-4f8b-bd44-1425fe158640" name="com.mbeddr.doc.meta">
       <concept id="4411878964391805161" name="com.mbeddr.doc.meta.structure.AbstractModuleRefWord" flags="ng" index="XFqhy">
-        <child id="4411878964391805166" name="moduleRef" index="XFqh_" />
+        <child id="8480291644168929007" name="identity" index="2nPJaY" />
       </concept>
       <concept id="8408742697223012410" name="com.mbeddr.doc.meta.structure.LanguageRefWord" flags="ng" index="3R4DFk" />
     </language>
@@ -395,36 +395,36 @@
                   <property role="19SUeA" value="All of the following MPS languages:\n" />
                 </node>
                 <node concept="3R4DFk" id="3TSnT3IxdUA" role="19SJt6">
-                  <node concept="A2Dkr" id="3TSnT3IxiAP" role="XFqh_">
-                    <property role="A2Dkp" value="com.mbeddr.mpsutil.multilingual.common" />
-                    <property role="A2Dkq" value="23f985f2-965f-4af1-aee8-a32677429514" />
+                  <node concept="1dCxOk" id="4AENUaOqpQh" role="2nPJaY">
+                    <property role="1XweGW" value="23f985f2-965f-4af1-aee8-a32677429514" />
+                    <property role="1XxBO9" value="com.mbeddr.mpsutil.multilingual.common" />
                   </node>
                 </node>
                 <node concept="19SUe$" id="3TSnT3IxiAZ" role="19SJt6">
                   <property role="19SUeA" value=",\n" />
                 </node>
                 <node concept="3R4DFk" id="3TSnT3IxiAR" role="19SJt6">
-                  <node concept="A2Dkr" id="3TSnT3IxiCt" role="XFqh_">
-                    <property role="A2Dkp" value="com.mbeddr.mpsutil.multilingual.baseLanguage" />
-                    <property role="A2Dkq" value="d2a1d976-43a2-462f-ac3a-9b258ced839d" />
+                  <node concept="1dCxOk" id="4FginuvUeP$" role="2nPJaY">
+                    <property role="1XweGW" value="d2a1d976-43a2-462f-ac3a-9b258ced839d" />
+                    <property role="1XxBO9" value="com.mbeddr.mpsutil.multilingual.baseLanguage" />
                   </node>
                 </node>
                 <node concept="19SUe$" id="3TSnT3IxdUB" role="19SJt6">
                   <property role="19SUeA" value=",\n" />
                 </node>
                 <node concept="3R4DFk" id="3TSnT3IxiBE" role="19SJt6">
-                  <node concept="A2Dkr" id="3TSnT3IxiCx" role="XFqh_">
-                    <property role="A2Dkp" value="com.mbeddr.mpsutil.multilingual.editor" />
-                    <property role="A2Dkq" value="13a9e567-3b9e-4ccf-b94c-9155f5e78586" />
+                  <node concept="1dCxOk" id="4FginuvUeP_" role="2nPJaY">
+                    <property role="1XweGW" value="13a9e567-3b9e-4ccf-b94c-9155f5e78586" />
+                    <property role="1XxBO9" value="com.mbeddr.mpsutil.multilingual.editor" />
                   </node>
                 </node>
                 <node concept="19SUe$" id="3TSnT3IxiBD" role="19SJt6">
                   <property role="19SUeA" value=",\n" />
                 </node>
                 <node concept="3R4DFk" id="3TSnT3IxiBn" role="19SJt6">
-                  <node concept="A2Dkr" id="3TSnT3IxiCz" role="XFqh_">
-                    <property role="A2Dkp" value="com.mbeddr.mpsutil.multilingual.concept" />
-                    <property role="A2Dkq" value="d0fe2e60-9f9c-4d3c-94aa-de9257b67a6d" />
+                  <node concept="1dCxOk" id="4FginuvUePA" role="2nPJaY">
+                    <property role="1XweGW" value="d0fe2e60-9f9c-4d3c-94aa-de9257b67a6d" />
+                    <property role="1XxBO9" value="com.mbeddr.mpsutil.multilingual.concept" />
                   </node>
                 </node>
                 <node concept="19SUe$" id="3TSnT3IxiBm" role="19SJt6" />
@@ -774,9 +774,9 @@
             <property role="19SUeA" value="Both can be used at any place a simple Java string constant can be used. Make sure the MPS language " />
           </node>
           <node concept="3R4DFk" id="3TSnT3I_Wvm" role="19SJt6">
-            <node concept="A2Dkr" id="3TSnT3I_Wvr" role="XFqh_">
-              <property role="A2Dkp" value="com.mbeddr.mpsutil.multilingual.baseLanguage" />
-              <property role="A2Dkq" value="d2a1d976-43a2-462f-ac3a-9b258ced839d" />
+            <node concept="1dCxOk" id="4FginuvUePB" role="2nPJaY">
+              <property role="1XweGW" value="d2a1d976-43a2-462f-ac3a-9b258ced839d" />
+              <property role="1XxBO9" value="com.mbeddr.mpsutil.multilingual.baseLanguage" />
             </node>
           </node>
           <node concept="19SUe$" id="3TSnT3I_Wvn" role="19SJt6">
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps
index f0967de3efa..45942f5e353 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/models/test.com.mbeddr.mpsutil.common.util@tests.mps
@@ -537,7 +537,7 @@
               </node>
               <node concept="2YIFZM" id="9jWrhFl41$" role="33vP2m">
                 <ref role="37wK5l" to="7wpd:9jWrhFiXuJ" resolve="lazy" />
-                <ref role="1Pybhc" to="7wpd:9jWrhFiXtZ" resolve="LazyInitCheck" />
+                <ref role="1Pybhc" to="7wpd:9jWrhFiXtZ" resolve="LazyInitWithCheck" />
                 <node concept="1bVj0M" id="9jWrhFl41_" role="37wK5m">
                   <node concept="3clFbS" id="9jWrhFl41A" role="1bW5cS">
                     <node concept="3SKdUt" id="9jWrhFl41B" role="3cqZAp">
@@ -2097,7 +2097,7 @@
                 <property role="3cmrfH" value="1" />
               </node>
               <node concept="37vLTw" id="1BQevbW9Vw4" role="37wK5m">
-                <ref role="3cqZAo" node="1BQevbW8OqS" resolve="successorFunc" />
+                <ref role="3cqZAo" node="1BQevbW8OqS" resolve="successorFunc2" />
               </node>
               <node concept="3uibUv" id="1BQevbW9Vw5" role="3PaCim">
                 <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
@@ -2247,7 +2247,7 @@
                 </node>
               </node>
               <node concept="37vLTw" id="1BQevbW9Vwq" role="37wK5m">
-                <ref role="3cqZAo" node="1BQevbW8OqS" resolve="successorFunc" />
+                <ref role="3cqZAo" node="1BQevbW8OqS" resolve="successorFunc2" />
               </node>
               <node concept="3uibUv" id="1BQevbW9Vwr" role="3PaCim">
                 <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
@@ -2327,7 +2327,7 @@
                 </node>
               </node>
               <node concept="37vLTw" id="1BQevbW9VwU" role="37wK5m">
-                <ref role="3cqZAo" node="1BQevbW8OqS" resolve="successorFunc" />
+                <ref role="3cqZAo" node="1BQevbW8OqS" resolve="successorFunc2" />
               </node>
               <node concept="3uibUv" id="1BQevbW9VwV" role="3PaCim">
                 <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
@@ -2425,7 +2425,7 @@
                 </node>
               </node>
               <node concept="37vLTw" id="1BQevbW9Vxw" role="37wK5m">
-                <ref role="3cqZAo" node="1BQevbW8OqS" resolve="successorFunc" />
+                <ref role="3cqZAo" node="1BQevbW8OqS" resolve="successorFunc2" />
               </node>
               <node concept="3uibUv" id="1BQevbW9Vxx" role="3PaCim">
                 <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
@@ -2492,7 +2492,7 @@
                 </node>
               </node>
               <node concept="37vLTw" id="1BQevbW9VxY" role="37wK5m">
-                <ref role="3cqZAo" node="1BQevbW8OqS" resolve="successorFunc" />
+                <ref role="3cqZAo" node="1BQevbW8OqS" resolve="successorFunc2" />
               </node>
               <node concept="3uibUv" id="1BQevbW9VxZ" role="3PaCim">
                 <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
@@ -2597,7 +2597,7 @@
                 </node>
               </node>
               <node concept="37vLTw" id="1BQevbW9VyE" role="37wK5m">
-                <ref role="3cqZAo" node="1BQevbW8OqS" resolve="successorFunc" />
+                <ref role="3cqZAo" node="1BQevbW8OqS" resolve="successorFunc2" />
               </node>
               <node concept="3uibUv" id="1BQevbW9VyF" role="3PaCim">
                 <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
@@ -2763,7 +2763,7 @@
           </node>
         </node>
         <node concept="2AHcQZ" id="1BQevbWbAHs" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" />
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
       <node concept="15s5l7" id="QrefRhl9tG" role="lGtFl">
@@ -2805,7 +2805,7 @@
       </node>
       <node concept="3Tm1VV" id="1BQevbWbEVv" role="1B3o_S" />
       <node concept="3uibUv" id="1BQevbWbGcY" role="1zkMxy">
-        <ref role="3uigEE" node="1BQevbWb_fV" resolve="FullTraversal" />
+        <ref role="3uigEE" node="1BQevbWb_fV" resolve="TraversalClassAPI_NoCycles_Test.FullTraversal" />
       </node>
       <node concept="3clFb_" id="1BQevbWbGUn" role="jymVt">
         <property role="TrG5h" value="finishNow" />
@@ -2830,7 +2830,7 @@
           </node>
         </node>
         <node concept="2AHcQZ" id="1BQevbWbGUP" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" />
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
     </node>
@@ -2845,12 +2845,12 @@
             <node concept="3cpWsn" id="1BQevbWbK6S" role="3cpWs9">
               <property role="TrG5h" value="t" />
               <node concept="3uibUv" id="1BQevbWbJUF" role="1tU5fm">
-                <ref role="3uigEE" node="1BQevbWb_fV" resolve="FullTraversal" />
+                <ref role="3uigEE" node="1BQevbWb_fV" resolve="TraversalClassAPI_NoCycles_Test.FullTraversal" />
               </node>
               <node concept="2ShNRf" id="1BQevbWbK6T" role="33vP2m">
                 <node concept="HV5vD" id="1BQevbWbK6U" role="2ShVmc">
                   <property role="373rjd" value="true" />
-                  <ref role="HV5vE" node="1BQevbWb_fV" resolve="FullTraversal" />
+                  <ref role="HV5vE" node="1BQevbWb_fV" resolve="TraversalClassAPI_NoCycles_Test.FullTraversal" />
                 </node>
               </node>
             </node>
@@ -2913,12 +2913,12 @@
             <node concept="3cpWsn" id="1BQevbWbSiw" role="3cpWs9">
               <property role="TrG5h" value="t" />
               <node concept="3uibUv" id="1BQevbWbSix" role="1tU5fm">
-                <ref role="3uigEE" node="1BQevbWb_fV" resolve="FullTraversal" />
+                <ref role="3uigEE" node="1BQevbWb_fV" resolve="TraversalClassAPI_NoCycles_Test.FullTraversal" />
               </node>
               <node concept="2ShNRf" id="1BQevbWbSiy" role="33vP2m">
                 <node concept="HV5vD" id="1BQevbWbSiz" role="2ShVmc">
                   <property role="373rjd" value="true" />
-                  <ref role="HV5vE" node="1BQevbWb_fV" resolve="FullTraversal" />
+                  <ref role="HV5vE" node="1BQevbWb_fV" resolve="TraversalClassAPI_NoCycles_Test.FullTraversal" />
                 </node>
               </node>
             </node>
@@ -2980,12 +2980,12 @@
             <node concept="3cpWsn" id="1BQevbWbZut" role="3cpWs9">
               <property role="TrG5h" value="t" />
               <node concept="3uibUv" id="1BQevbWbZuu" role="1tU5fm">
-                <ref role="3uigEE" node="1BQevbWb_fV" resolve="FullTraversal" />
+                <ref role="3uigEE" node="1BQevbWb_fV" resolve="TraversalClassAPI_NoCycles_Test.FullTraversal" />
               </node>
               <node concept="2ShNRf" id="1BQevbWbZuv" role="33vP2m">
                 <node concept="HV5vD" id="1BQevbWbZuw" role="2ShVmc">
                   <property role="373rjd" value="true" />
-                  <ref role="HV5vE" node="1BQevbWb_fV" resolve="FullTraversal" />
+                  <ref role="HV5vE" node="1BQevbWb_fV" resolve="TraversalClassAPI_NoCycles_Test.FullTraversal" />
                 </node>
               </node>
             </node>
@@ -3072,11 +3072,11 @@
             <node concept="3cpWsn" id="1BQevbWc2Wx" role="3cpWs9">
               <property role="TrG5h" value="t" />
               <node concept="3uibUv" id="1BQevbWc2S3" role="1tU5fm">
-                <ref role="3uigEE" node="1BQevbWbF$f" resolve="SearchTraversal" />
+                <ref role="3uigEE" node="1BQevbWbF$f" resolve="TraversalClassAPI_NoCycles_Test.SearchTraversal" />
               </node>
               <node concept="2ShNRf" id="1BQevbWc2Wy" role="33vP2m">
                 <node concept="1pGfFk" id="1BQevbWc62R" role="2ShVmc">
-                  <ref role="37wK5l" node="1BQevbWc5V_" resolve="SearchTraversal" />
+                  <ref role="37wK5l" node="1BQevbWc5V_" resolve="TraversalClassAPI_NoCycles_Test.SearchTraversal" />
                   <node concept="3cmrfG" id="1BQevbWc8Dx" role="37wK5m">
                     <property role="3cmrfH" value="4" />
                   </node>
@@ -3174,11 +3174,11 @@
             <node concept="3cpWsn" id="1BQevbWc4rl" role="3cpWs9">
               <property role="TrG5h" value="t" />
               <node concept="3uibUv" id="1BQevbWc4rm" role="1tU5fm">
-                <ref role="3uigEE" node="1BQevbWbF$f" resolve="SearchTraversal" />
+                <ref role="3uigEE" node="1BQevbWbF$f" resolve="TraversalClassAPI_NoCycles_Test.SearchTraversal" />
               </node>
               <node concept="2ShNRf" id="1BQevbWc4rn" role="33vP2m">
                 <node concept="1pGfFk" id="1BQevbWc62P" role="2ShVmc">
-                  <ref role="37wK5l" node="1BQevbWc5V_" resolve="SearchTraversal" />
+                  <ref role="37wK5l" node="1BQevbWc5V_" resolve="TraversalClassAPI_NoCycles_Test.SearchTraversal" />
                   <node concept="3cmrfG" id="1BQevbWc8Fq" role="37wK5m">
                     <property role="3cmrfH" value="77" />
                   </node>
@@ -3243,11 +3243,11 @@
             <node concept="3cpWsn" id="1BQevbWc90t" role="3cpWs9">
               <property role="TrG5h" value="t" />
               <node concept="3uibUv" id="1BQevbWc90u" role="1tU5fm">
-                <ref role="3uigEE" node="1BQevbWbF$f" resolve="SearchTraversal" />
+                <ref role="3uigEE" node="1BQevbWbF$f" resolve="TraversalClassAPI_NoCycles_Test.SearchTraversal" />
               </node>
               <node concept="2ShNRf" id="1BQevbWc90v" role="33vP2m">
                 <node concept="1pGfFk" id="1BQevbWc90w" role="2ShVmc">
-                  <ref role="37wK5l" node="1BQevbWc5V_" resolve="SearchTraversal" />
+                  <ref role="37wK5l" node="1BQevbWc5V_" resolve="TraversalClassAPI_NoCycles_Test.SearchTraversal" />
                   <node concept="3cmrfG" id="1BQevbWc90x" role="37wK5m">
                     <property role="3cmrfH" value="4" />
                   </node>
@@ -3352,11 +3352,11 @@
             <node concept="3cpWsn" id="1BQevbWccgd" role="3cpWs9">
               <property role="TrG5h" value="t" />
               <node concept="3uibUv" id="1BQevbWccge" role="1tU5fm">
-                <ref role="3uigEE" node="1BQevbWbF$f" resolve="SearchTraversal" />
+                <ref role="3uigEE" node="1BQevbWbF$f" resolve="TraversalClassAPI_NoCycles_Test.SearchTraversal" />
               </node>
               <node concept="2ShNRf" id="1BQevbWccgf" role="33vP2m">
                 <node concept="1pGfFk" id="1BQevbWccgg" role="2ShVmc">
-                  <ref role="37wK5l" node="1BQevbWc5V_" resolve="SearchTraversal" />
+                  <ref role="37wK5l" node="1BQevbWc5V_" resolve="TraversalClassAPI_NoCycles_Test.SearchTraversal" />
                   <node concept="3cmrfG" id="1BQevbWcdbx" role="37wK5m">
                     <property role="3cmrfH" value="1" />
                   </node>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/test.com.mbeddr.mpsutil.common.msd b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/test.com.mbeddr.mpsutil.common.msd
index 4345b093025..c4515a382b3 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/test.com.mbeddr.mpsutil.common.msd
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/test.com.mbeddr.mpsutil.common.msd
@@ -36,7 +36,6 @@
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="c7a315e6-1d93-4186-85bc-2dfafd1ccc21(com.mbeddr.mpsutil.common)" version="0" />
     <module reference="822a7acd-f487-45f5-bbb9-1ce595a1705f(com.mbeddr.mpsutil.ecore.stubs)" version="0" />
-    <module reference="b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)" version="0" />
     <module reference="fceddec6-7184-49a0-9009-0da4dbdc8b95(test.com.mbeddr.mpsutil.common)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/test.com.mbeddr.mpsutil.compare.msd b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/test.com.mbeddr.mpsutil.compare.msd
index 679e72973c2..561c64147f4 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/test.com.mbeddr.mpsutil.compare.msd
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/test.com.mbeddr.mpsutil.compare.msd
@@ -17,7 +17,6 @@
     <dependency reexport="false">6bbe9909-811d-4431-b023-f60f7e6d7891(test.com.mbeddr.mpsutil.compare.testlang)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:e0989c7a-8149-4be7-97b6-0b78561af099:com.mbeddr.demo.comparator.diff" version="0" />
     <language slang="l:f47b95d4-5e73-4c04-9204-18076950153b:com.mbeddr.mpsutil.compare" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
diff --git a/code/languages/com.mbeddr.xmodel/_spreferences/CodeReviewPreferences/module.msd b/code/languages/com.mbeddr.xmodel/_spreferences/CodeReviewPreferences/module.msd
index 952d9fd3e66..ed9dca2fc28 100644
--- a/code/languages/com.mbeddr.xmodel/_spreferences/CodeReviewPreferences/module.msd
+++ b/code/languages/com.mbeddr.xmodel/_spreferences/CodeReviewPreferences/module.msd
@@ -24,6 +24,7 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.plan/com.mbeddr.xmodel.plan.msd b/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.plan/com.mbeddr.xmodel.plan.msd
index bac90f12fe1..8ae8d0bcbc3 100644
--- a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.plan/com.mbeddr.xmodel.plan.msd
+++ b/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.plan/com.mbeddr.xmodel.plan.msd
@@ -12,7 +12,7 @@
   </facets>
   <sourcePath />
   <languageVersions>
-    <language slang="l:c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1:de.slisson.mps.hacks.xmodelgen" version="0" />
+    <language slang="l:c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1:de.itemis.mps.hacks.xmodelgen" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
diff --git a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.plan/models/genplan.mps b/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.plan/models/genplan.mps
index 1430030a30e..03283850c4c 100644
--- a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.plan/models/genplan.mps
+++ b/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.plan/models/genplan.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan" version="1" />
-    <use id="c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1" name="de.slisson.mps.hacks.xmodelgen" version="0" />
+    <use id="c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1" name="de.itemis.mps.hacks.xmodelgen" version="0" />
   </languages>
   <imports>
     <import index="8r34" ref="r:5f62df63-885f-42f0-80d6-e13ad6c51489(com.mbeddr.core.modules.gen.generator.template.main@generator)" implicit="true" />
@@ -47,12 +47,12 @@
       </concept>
       <concept id="3750601816081736033" name="jetbrains.mps.lang.generator.plan.structure.InPlaceCheckpointSpec" flags="ng" index="3ps74r" />
     </language>
-    <language id="c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1" name="de.slisson.mps.hacks.xmodelgen">
-      <concept id="961590472824346305" name="de.slisson.mps.hacks.xmodelgen.structure.MappingConfigStep" flags="ng" index="2Pg1uL">
+    <language id="c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1" name="de.itemis.mps.hacks.xmodelgen">
+      <concept id="961590472824346305" name="de.itemis.mps.hacks.xmodelgen.structure.MappingConfigStep" flags="ng" index="2Pg1uL">
         <child id="7786846688815598697" name="mappingConfigurations" index="3VlUeB" />
       </concept>
-      <concept id="961590472824361214" name="de.slisson.mps.hacks.xmodelgen.structure.MCListLanguageIdentity" flags="ng" index="2Pgd6e" />
-      <concept id="7786846688815408482" name="de.slisson.mps.hacks.xmodelgen.structure.MappingConfigurationReference" flags="ng" index="3Vl8EG">
+      <concept id="961590472824361214" name="de.itemis.mps.hacks.xmodelgen.structure.MCListLanguageIdentity" flags="ng" index="2Pgd6e" />
+      <concept id="7786846688815408482" name="de.itemis.mps.hacks.xmodelgen.structure.MappingConfigurationReference" flags="ng" index="3Vl8EG">
         <reference id="7786846688815408483" name="mc" index="3Vl8EH" />
       </concept>
     </language>