diff --git a/.mps/migration.xml b/.mps/migration.xml
index 349b4d7..5d5be53 100644
--- a/.mps/migration.xml
+++ b/.mps/migration.xml
@@ -5,5 +5,7 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v191.SaveAllJavaStubMethodRefsToShortForeignFormat" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v191.UpdateJavaStubMethodRefs" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2019_3.DefaultFacetExplicitPersistence" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2021_2.SplitMPSCoreStub" value="executed" />
+    <entry key="project.migrated.version" value="212" />
   </component>
 </project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 2d8d019..938f3eb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,8 +32,8 @@ configurations {
 }
 
 dependencies {
-    mps "com.jetbrains:mps:2021.1.+"
-    languageLibs "com.mbeddr:mbeddr:2021.1.+"
+    mps "com.jetbrains:mps:2021.2.+"
+    languageLibs "com.mbeddr:mbeddr:2021.2.+"
     junitAnt 'org.apache.ant:ant-junit:1.10.11'
 }
 
diff --git a/build/languageBuild.xml b/build/languageBuild.xml
index a7c44c2..28fb329 100644
--- a/build/languageBuild.xml
+++ b/build/languageBuild.xml
@@ -41,8 +41,7 @@
   
   <path id="path.mps.ant.path">
     <pathelement location="${artifacts.mps}/lib/ant/lib/ant-mps.jar" />
-    <pathelement location="${artifacts.mps}/lib/jdom.jar" />
-    <pathelement location="${artifacts.mps}/lib/log4j.jar" />
+    <pathelement location="${artifacts.mps}/lib/util.jar" />
   </path>
   
   <target name="assemble" depends="classes, declare-mps-tasks">
@@ -65,6 +64,29 @@
         </extensions>
       </idea-plugin>
     </echoxml>
+    <mkdir dir="${build.layout}/com.dslfoundry.dflat/lib" />
+    <mkdir dir="${build.tmp}/default/com.dslfoundry.dflat.jar" />
+    <mkdir dir="${build.tmp}/default/com.dslfoundry.dflat.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/com.dslfoundry.dflat.jar/META-INF/plugin.xml">
+      <idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
+        <id>com.dslfoundry.dflat</id>
+        <name>com.dslfoundry.dflat</name>
+        <version>${dflat.version}</version>
+        <depends>jetbrains.mps.core</depends>
+        <depends>com.mbeddr.platform</depends>
+        <depends>com.mbeddr.platform.build</depends>
+        <depends>de.itemis.mps.grammarcells</depends>
+        <depends>de.slisson.mps.richtext</depends>
+        <depends>de.itemis.mps.extensions.build</depends>
+        
+        <extensions defaultExtensionNs="com.intellij">
+          <mps.LanguageLibrary dir="/languages" />
+        </extensions>
+      </idea-plugin>
+    </echoxml>
+    <jar destfile="${build.layout}/com.dslfoundry.dflat/lib/com.dslfoundry.dflat.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/default/com.dslfoundry.dflat.jar" />
+    </jar>
     <mkdir dir="${build.layout}/com.dslfoundry.dflat/languages" />
     <mkdir dir="${build.layout}/com.dslfoundry.dflat/languages/com.dslfoundry.dflat" />
     <mkdir dir="${build.tmp}/default/com.dslfoundry.dflat.expression.jar" />
@@ -588,9 +610,9 @@
       <zipfileset file="${dflat.home}/solutions/com.dslfoundry.dflat.build/com.dslfoundry.dflat.build.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-com.dslfoundry.dflat.build-models" prefix="module/models" />
     </jar>
-    <mkdir dir="${build.tmp}/default/com.dslfoundry.dflat.jar" />
-    <mkdir dir="${build.tmp}/default/com.dslfoundry.dflat.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/com.dslfoundry.dflat.jar/META-INF/module.xml">
+    <mkdir dir="${build.tmp}/default/com.dslfoundry.dflat.jar1" />
+    <mkdir dir="${build.tmp}/default/com.dslfoundry.dflat.jar1/META-INF" />
+    <echoxml file="${build.tmp}/default/com.dslfoundry.dflat.jar1/META-INF/module.xml">
       <module namespace="com.dslfoundry.dflat" type="devkit" uuid="97be3f2e-6ee3-4400-ade4-6b4b2f948d52">
         <dependencies />
         <uses />
@@ -599,7 +621,7 @@
     </echoxml>
     <jar destfile="${build.layout}/com.dslfoundry.dflat/languages/com.dslfoundry.dflat/com.dslfoundry.dflat.jar" duplicate="preserve">
       <zipfileset file="${dflat.home}/devkits/com.dslfoundry.dflat/com.dslfoundry.dflat.devkit" prefix="module" />
-      <fileset dir="${build.tmp}/default/com.dslfoundry.dflat.jar" />
+      <fileset dir="${build.tmp}/default/com.dslfoundry.dflat.jar1" />
     </jar>
     <mkdir dir="${build.tmp}/default/com.dslfoundry.dflat-_dl__lbrace_dflat.version_rbrace_.zip" />
     <mkdir dir="${build.tmp}/default/com.dslfoundry.dflat-_dl__lbrace_dflat.version_rbrace_.zip/com.dslfoundry.dflat" />
@@ -621,6 +643,29 @@
         </extensions>
       </idea-plugin>
     </echoxml>
+    <mkdir dir="${build.tmp}/default/com.dslfoundry.dflat-_dl__lbrace_dflat.version_rbrace_.zip/com.dslfoundry.dflat/lib" />
+    <mkdir dir="${build.tmp}/default/com.dslfoundry.dflat.jar2" />
+    <mkdir dir="${build.tmp}/default/com.dslfoundry.dflat.jar2/META-INF" />
+    <echoxml file="${build.tmp}/default/com.dslfoundry.dflat.jar2/META-INF/plugin.xml">
+      <idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
+        <id>com.dslfoundry.dflat</id>
+        <name>com.dslfoundry.dflat</name>
+        <version>${dflat.version}</version>
+        <depends>jetbrains.mps.core</depends>
+        <depends>com.mbeddr.platform</depends>
+        <depends>com.mbeddr.platform.build</depends>
+        <depends>de.itemis.mps.grammarcells</depends>
+        <depends>de.slisson.mps.richtext</depends>
+        <depends>de.itemis.mps.extensions.build</depends>
+        
+        <extensions defaultExtensionNs="com.intellij">
+          <mps.LanguageLibrary dir="/languages" />
+        </extensions>
+      </idea-plugin>
+    </echoxml>
+    <jar destfile="${build.tmp}/default/com.dslfoundry.dflat-_dl__lbrace_dflat.version_rbrace_.zip/com.dslfoundry.dflat/lib/com.dslfoundry.dflat.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/default/com.dslfoundry.dflat.jar2" />
+    </jar>
     <mkdir dir="${build.tmp}/default/com.dslfoundry.dflat-_dl__lbrace_dflat.version_rbrace_.zip/com.dslfoundry.dflat/languages" />
     <mkdir dir="${build.tmp}/default/com.dslfoundry.dflat-_dl__lbrace_dflat.version_rbrace_.zip/com.dslfoundry.dflat/languages/com.dslfoundry.dflat" />
     <mkdir dir="${build.tmp}/default/com.dslfoundry.dflat.expression.jar1" />
@@ -1144,9 +1189,9 @@
       <zipfileset file="${dflat.home}/solutions/com.dslfoundry.dflat.build/com.dslfoundry.dflat.build.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-com.dslfoundry.dflat.build-models1" prefix="module/models" />
     </jar>
-    <mkdir dir="${build.tmp}/default/com.dslfoundry.dflat.jar1" />
-    <mkdir dir="${build.tmp}/default/com.dslfoundry.dflat.jar1/META-INF" />
-    <echoxml file="${build.tmp}/default/com.dslfoundry.dflat.jar1/META-INF/module.xml">
+    <mkdir dir="${build.tmp}/default/com.dslfoundry.dflat.jar3" />
+    <mkdir dir="${build.tmp}/default/com.dslfoundry.dflat.jar3/META-INF" />
+    <echoxml file="${build.tmp}/default/com.dslfoundry.dflat.jar3/META-INF/module.xml">
       <module namespace="com.dslfoundry.dflat" type="devkit" uuid="97be3f2e-6ee3-4400-ade4-6b4b2f948d52">
         <dependencies />
         <uses />
@@ -1155,7 +1200,7 @@
     </echoxml>
     <jar destfile="${build.tmp}/default/com.dslfoundry.dflat-_dl__lbrace_dflat.version_rbrace_.zip/com.dslfoundry.dflat/languages/com.dslfoundry.dflat/com.dslfoundry.dflat.jar" duplicate="preserve">
       <zipfileset file="${dflat.home}/devkits/com.dslfoundry.dflat/com.dslfoundry.dflat.devkit" prefix="module" />
-      <fileset dir="${build.tmp}/default/com.dslfoundry.dflat.jar1" />
+      <fileset dir="${build.tmp}/default/com.dslfoundry.dflat.jar3" />
     </jar>
     <zip destfile="${build.layout}/com.dslfoundry.dflat-${dflat.version}.zip">
       <fileset dir="${build.tmp}/default/com.dslfoundry.dflat-_dl__lbrace_dflat.version_rbrace_.zip" />
@@ -1196,9 +1241,13 @@
       <plugin path="${artifacts.com.mbeddr.platform}/mps-multiline" />
       <plugin path="${artifacts.com.mbeddr.platform}/mps-richtext" />
       <plugin path="${artifacts.mps}/lib/mps-workbench.jar" />
+      <plugin path="${artifacts.mps}/plugins/git4idea" />
       <plugin path="${artifacts.mps}/plugins/mps-build" />
       <plugin path="${artifacts.mps}/plugins/mps-core" />
+      <plugin path="${artifacts.mps}/plugins/mps-git4idea" />
       <plugin path="${artifacts.mps}/plugins/mps-tooltips" />
+      <plugin path="${artifacts.mps}/plugins/mps-vcs" />
+      <plugin path="${artifacts.mps}/plugins/svn4idea" />
       <library file="${artifacts.mps}/languages/baseLanguage/closures.runtime.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/collections.runtime.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
@@ -1289,6 +1338,7 @@
       <library file="${artifacts.mps}/languages/plaf/jetbrains.mps.baseLanguage.util.jar" />
       <library file="${artifacts.mps}/languages/plaf/jetbrains.mps.ide.platform.jar" />
       <library file="${artifacts.mps}/languages/plaf/jetbrains.mps.ide.refactoring.platform.jar" />
+      <library file="${artifacts.mps}/languages/plaf/jetbrains.mps.ide.ui.jar" />
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.findUsages.runtime.jar" />
@@ -1309,10 +1359,15 @@
       <library file="${artifacts.mps}/languages/util/jetbrains.mps.java.stub.jar" />
       <library file="${artifacts.mps}/languages/util/jetbrains.mps.kernel.jar" />
       <library file="${artifacts.mps}/languages/util/jetbrains.mps.lang.makeup.jar" />
+      <library file="${artifacts.mps}/languages/util/jetbrains.mps.persistence.jar" />
       <library file="${artifacts.mps}/languages/util/jetbrains.mps.project.jar" />
       <library file="${artifacts.mps}/languages/util/jetbrains.mps.refactoring.jar" />
       <library file="${artifacts.mps}/languages/util/jetbrains.mps.runtime.jar" />
       <library file="${artifacts.mps}/languages/xml/jetbrains.mps.core.xml.jar" />
+      <library file="${artifacts.mps}/plugins/mps-vcs/languages/jetbrains.mps.ide.vcs.modelmetadata.jar" />
+      <library file="${artifacts.mps}/plugins/mps-vcs/lib/jetbrains.mps.ide.vcs.core.jar" />
+      <library file="${artifacts.mps}/plugins/mps-vcs/lib/jetbrains.mps.ide.vcs.platform.jar" />
+      <library file="${artifacts.mps}/plugins/mps-vcs/lib/jetbrains.mps.vcs.mergehints.runtime.jar" />
       <chunk bootstrap="true">
         <module file="${dflat.home}/solutions/com.dslfoundry.dflat.build/com.dslfoundry.dflat.build.msd" />
         <module file="${dflat.home}/languages/com.dslfoundry.dflat.expression/com.dslfoundry.dflat.expression.mpl" />
@@ -1381,12 +1436,13 @@
         <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
         <fileset file="${artifacts.mps}/lib/mps-problem.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messages-for-rules.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
-        <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${artifacts.mps}/lib/jdom.jar" />
-        <fileset file="${artifacts.mps}/lib/trove4j.jar" />
+        <fileset file="${artifacts.mps}/lib/util.jar" />
+        <fileset file="${artifacts.mps}/lib/3rd-party.jar" />
         <fileset file="${artifacts.mps}/lib/ecj-4.16.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.grammarcells/languages/de.itemis.mps.grammarcells/com.mbeddr.mpsutil.grammarcells.runtime.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
@@ -1445,12 +1501,13 @@
         <fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
         <fileset file="${artifacts.mps}/lib/mps-problem.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messages-for-rules.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
-        <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${artifacts.mps}/lib/jdom.jar" />
-        <fileset file="${artifacts.mps}/lib/trove4j.jar" />
+        <fileset file="${artifacts.mps}/lib/util.jar" />
+        <fileset file="${artifacts.mps}/lib/3rd-party.jar" />
         <fileset file="${artifacts.mps}/lib/ecj-4.16.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.grammarcells/languages/de.itemis.mps.grammarcells/com.mbeddr.mpsutil.grammarcells.runtime.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
@@ -1493,7 +1550,9 @@
         <fileset file="${artifacts.mps}/lib/mps-context.jar" />
         <fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-problem.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messages-for-rules.jar" />
         <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
@@ -1514,9 +1573,8 @@
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
-        <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${artifacts.mps}/lib/jdom.jar" />
-        <fileset file="${artifacts.mps}/lib/trove4j.jar" />
+        <fileset file="${artifacts.mps}/lib/util.jar" />
+        <fileset file="${artifacts.mps}/lib/3rd-party.jar" />
         <fileset file="${artifacts.mps}/lib/ecj-4.16.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.grammarcells/languages/de.itemis.mps.grammarcells/com.mbeddr.mpsutil.grammarcells.runtime.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
@@ -1554,7 +1612,9 @@
         <fileset file="${artifacts.mps}/lib/mps-context.jar" />
         <fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-problem.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messages-for-rules.jar" />
         <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
@@ -1575,9 +1635,8 @@
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
-        <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${artifacts.mps}/lib/jdom.jar" />
-        <fileset file="${artifacts.mps}/lib/trove4j.jar" />
+        <fileset file="${artifacts.mps}/lib/util.jar" />
+        <fileset file="${artifacts.mps}/lib/3rd-party.jar" />
         <fileset file="${artifacts.mps}/lib/ecj-4.16.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.grammarcells/languages/de.itemis.mps.grammarcells/com.mbeddr.mpsutil.grammarcells.runtime.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
@@ -1615,7 +1674,9 @@
         <fileset file="${artifacts.mps}/lib/mps-context.jar" />
         <fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-problem.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messages-for-rules.jar" />
         <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
@@ -1636,9 +1697,8 @@
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
-        <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${artifacts.mps}/lib/jdom.jar" />
-        <fileset file="${artifacts.mps}/lib/trove4j.jar" />
+        <fileset file="${artifacts.mps}/lib/util.jar" />
+        <fileset file="${artifacts.mps}/lib/3rd-party.jar" />
         <fileset file="${artifacts.mps}/lib/ecj-4.16.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.grammarcells/languages/de.itemis.mps.grammarcells/com.mbeddr.mpsutil.grammarcells.runtime.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
@@ -1681,7 +1741,9 @@
         <fileset file="${artifacts.mps}/lib/mps-context.jar" />
         <fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-problem.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messages-for-rules.jar" />
         <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
@@ -1704,13 +1766,10 @@
         <pathelement path="${build.tmp}/java/out/com.dslfoundry.dflat.statement" />
         <pathelement path="${build.tmp}/java/out/com.dslfoundry.dflat.structure" />
         <pathelement path="${build.tmp}/java/out/com.dslfoundry.dflat.type" />
-        <fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
-        <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${artifacts.mps}/lib/jdom.jar" />
-        <fileset file="${artifacts.mps}/lib/trove4j.jar" />
+        <fileset file="${artifacts.mps}/lib/util.jar" />
+        <fileset file="${artifacts.mps}/lib/3rd-party.jar" />
         <fileset file="${artifacts.mps}/lib/ecj-4.16.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.styles.jar" />
@@ -1745,7 +1804,9 @@
         <fileset file="${artifacts.mps}/lib/mps-context.jar" />
         <fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-problem.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messages-for-rules.jar" />
         <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
@@ -1766,9 +1827,8 @@
         <fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
-        <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${artifacts.mps}/lib/jdom.jar" />
-        <fileset file="${artifacts.mps}/lib/trove4j.jar" />
+        <fileset file="${artifacts.mps}/lib/util.jar" />
+        <fileset file="${artifacts.mps}/lib/3rd-party.jar" />
         <fileset file="${artifacts.mps}/lib/ecj-4.16.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.runtime.jar" />
         <fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.styles.jar" />
diff --git a/gradle.properties b/gradle.properties
index 6e53f99..3b28b49 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
-dflatVersion = 2021.1
+dflatVersion = 2021.2
 systemProp.org.gradle.internal.http.connectionTimeout=180000
 systemProp.org.gradle.internal.http.socketTimeout=180000
diff --git a/languages/com.dslfoundry.dflat.expression/com.dslfoundry.dflat.expression.mpl b/languages/com.dslfoundry.dflat.expression/com.dslfoundry.dflat.expression.mpl
index e29e186..040a952 100644
--- a/languages/com.dslfoundry.dflat.expression/com.dslfoundry.dflat.expression.mpl
+++ b/languages/com.dslfoundry.dflat.expression/com.dslfoundry.dflat.expression.mpl
@@ -47,7 +47,7 @@
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
-    <language slang="l: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:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />
diff --git a/languages/com.dslfoundry.dflat.gensupport/com.dslfoundry.dflat.gensupport.mpl b/languages/com.dslfoundry.dflat.gensupport/com.dslfoundry.dflat.gensupport.mpl
index de89f1b..b068bcd 100644
--- a/languages/com.dslfoundry.dflat.gensupport/com.dslfoundry.dflat.gensupport.mpl
+++ b/languages/com.dslfoundry.dflat.gensupport/com.dslfoundry.dflat.gensupport.mpl
@@ -44,7 +44,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:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />
diff --git a/languages/com.dslfoundry.dflat.gensupport/models/com.dslfoundry.dflat.gensupport.behavior.mps b/languages/com.dslfoundry.dflat.gensupport/models/com.dslfoundry.dflat.gensupport.behavior.mps
index 0b87845..8891cfd 100644
--- a/languages/com.dslfoundry.dflat.gensupport/models/com.dslfoundry.dflat.gensupport.behavior.mps
+++ b/languages/com.dslfoundry.dflat.gensupport/models/com.dslfoundry.dflat.gensupport.behavior.mps
@@ -2,7 +2,7 @@
 <model ref="r:29f94f45-ca23-416b-b1c4-ed4d287dbfd6(com.dslfoundry.dflat.gensupport.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/languages/com.dslfoundry.dflat.statement/com.dslfoundry.dflat.statement.mpl b/languages/com.dslfoundry.dflat.statement/com.dslfoundry.dflat.statement.mpl
index a61800e..9284c3e 100644
--- a/languages/com.dslfoundry.dflat.statement/com.dslfoundry.dflat.statement.mpl
+++ b/languages/com.dslfoundry.dflat.statement/com.dslfoundry.dflat.statement.mpl
@@ -35,7 +35,6 @@
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
-    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="1" />
     <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
     <language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
     <language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />
@@ -53,7 +52,7 @@
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
-    <language slang="l: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:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />
diff --git a/languages/com.dslfoundry.dflat.structure/com.dslfoundry.dflat.structure.mpl b/languages/com.dslfoundry.dflat.structure/com.dslfoundry.dflat.structure.mpl
index 77869ec..7e6df19 100644
--- a/languages/com.dslfoundry.dflat.structure/com.dslfoundry.dflat.structure.mpl
+++ b/languages/com.dslfoundry.dflat.structure/com.dslfoundry.dflat.structure.mpl
@@ -39,7 +39,6 @@
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
-    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="1" />
     <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
     <language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
     <language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />
@@ -57,7 +56,7 @@
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
-    <language slang="l: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:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />
diff --git a/languages/com.dslfoundry.dflat.structure/models/com.dslfoundry.dflat.structure.behavior.mps b/languages/com.dslfoundry.dflat.structure/models/com.dslfoundry.dflat.structure.behavior.mps
index 5ff9e1e..e238118 100644
--- a/languages/com.dslfoundry.dflat.structure/models/com.dslfoundry.dflat.structure.behavior.mps
+++ b/languages/com.dslfoundry.dflat.structure/models/com.dslfoundry.dflat.structure.behavior.mps
@@ -149,6 +149,7 @@
       <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
         <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
       </concept>
+      <concept id="8329979535468945057" name="jetbrains.mps.lang.smodel.structure.Node_PresentationOperation" flags="ng" index="2Iv5rx" />
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
@@ -916,11 +917,14 @@
               </node>
             </node>
             <node concept="3cpWs3" id="2M_4rUgzMqk" role="3uHU7B">
-              <node concept="2OqwBi" id="2M_4rUgzMf5" role="3uHU7B">
-                <node concept="13iPFW" id="2M_4rUgzMf6" role="2Oq$k0" />
-                <node concept="3TrEf2" id="2M_4rUgzMf7" role="2OqNvi">
-                  <ref role="3Tt5mk" to="r1kv:5KwscwGd6$v" resolve="type" />
+              <node concept="2OqwBi" id="2miV12aGIDd" role="3uHU7B">
+                <node concept="2OqwBi" id="2M_4rUgzMf5" role="2Oq$k0">
+                  <node concept="13iPFW" id="2M_4rUgzMf6" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="2M_4rUgzMf7" role="2OqNvi">
+                    <ref role="3Tt5mk" to="r1kv:5KwscwGd6$v" resolve="type" />
+                  </node>
                 </node>
+                <node concept="2Iv5rx" id="2miV12aGIDe" role="2OqNvi" />
               </node>
               <node concept="Xl_RD" id="2M_4rUgzMqP" role="3uHU7w">
                 <property role="Xl_RC" value=" " />
diff --git a/languages/com.dslfoundry.dflat.type/com.dslfoundry.dflat.type.mpl b/languages/com.dslfoundry.dflat.type/com.dslfoundry.dflat.type.mpl
index 486437e..46358a0 100644
--- a/languages/com.dslfoundry.dflat.type/com.dslfoundry.dflat.type.mpl
+++ b/languages/com.dslfoundry.dflat.type/com.dslfoundry.dflat.type.mpl
@@ -45,7 +45,7 @@
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
-    <language slang="l: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:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />
diff --git a/languages/grammarcells/grammarcells.mpl b/languages/grammarcells/grammarcells.mpl
index 568e601..f6de4da 100644
--- a/languages/grammarcells/grammarcells.mpl
+++ b/languages/grammarcells/grammarcells.mpl
@@ -38,7 +38,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>
@@ -87,7 +87,7 @@
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
-    <language slang="l: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/languages/grammarcells/models/grammarcells.constraints.mps b/languages/grammarcells/models/grammarcells.constraints.mps
index 344a254..5b12867 100644
--- a/languages/grammarcells/models/grammarcells.constraints.mps
+++ b/languages/grammarcells/models/grammarcells.constraints.mps
@@ -106,6 +106,7 @@
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
+      <concept id="8329979535468945057" name="jetbrains.mps.lang.smodel.structure.Node_PresentationOperation" flags="ng" index="2Iv5rx" />
       <concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="6677504323281689838" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3bZ5Sz">
@@ -205,8 +206,11 @@
           </node>
           <node concept="2xdQw9" id="1lkQMM50Nvf" role="3cqZAp">
             <node concept="3cpWs3" id="1lkQMM50O$V" role="9lYJi">
-              <node concept="37vLTw" id="1lkQMM50OGU" role="3uHU7w">
-                <ref role="3cqZAo" node="1lkQMM50$6S" resolve="dotEx" />
+              <node concept="2OqwBi" id="2miV12aGIGj" role="3uHU7w">
+                <node concept="37vLTw" id="1lkQMM50OGU" role="2Oq$k0">
+                  <ref role="3cqZAo" node="1lkQMM50$6S" resolve="dotEx" />
+                </node>
+                <node concept="2Iv5rx" id="2miV12aGIGk" role="2OqNvi" />
               </node>
               <node concept="Xl_RD" id="1lkQMM50Nvh" role="3uHU7B">
                 <property role="Xl_RC" value="dotEx: " />
@@ -329,7 +333,10 @@
       <node concept="3clFbS" id="1lkQMM4Lluy" role="2VODD2">
         <node concept="2xdQw9" id="1lkQMM4Ll_S" role="3cqZAp">
           <node concept="3cpWs3" id="1lkQMM4Lmlv" role="9lYJi">
-            <node concept="2H4GUG" id="1lkQMM4Lmta" role="3uHU7w" />
+            <node concept="2OqwBi" id="2miV12aGIGJ" role="3uHU7w">
+              <node concept="2H4GUG" id="1lkQMM4Lmta" role="2Oq$k0" />
+              <node concept="2Iv5rx" id="2miV12aGIGK" role="2OqNvi" />
+            </node>
             <node concept="Xl_RD" id="1lkQMM4Ll_U" role="3uHU7B">
               <property role="Xl_RC" value="childNode: " />
             </node>
diff --git a/scripts/allScripts.xml b/scripts/allScripts.xml
index 186656d..a096f1e 100644
--- a/scripts/allScripts.xml
+++ b/scripts/allScripts.xml
@@ -40,8 +40,7 @@
   
   <path id="path.mps.ant.path">
     <pathelement location="${artifacts.mps}/lib/ant/lib/ant-mps.jar" />
-    <pathelement location="${artifacts.mps}/lib/jdom.jar" />
-    <pathelement location="${artifacts.mps}/lib/log4j.jar" />
+    <pathelement location="${artifacts.mps}/lib/util.jar" />
   </path>
   
   <target name="assemble" depends="classes, declare-mps-tasks">
diff --git a/solutions/com.dslfoundry.dflat.playground/com.dslfoundry.dflat.playground.msd b/solutions/com.dslfoundry.dflat.playground/com.dslfoundry.dflat.playground.msd
index 37316f7..eb8a7dc 100644
--- a/solutions/com.dslfoundry.dflat.playground/com.dslfoundry.dflat.playground.msd
+++ b/solutions/com.dslfoundry.dflat.playground/com.dslfoundry.dflat.playground.msd
@@ -25,7 +25,7 @@
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
     <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="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:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
diff --git a/solutions/com.dslfoundry.dflat.runtime/com.dslfoundry.dflat.runtime.msd b/solutions/com.dslfoundry.dflat.runtime/com.dslfoundry.dflat.runtime.msd
index 61da9c3..669d041 100644
--- a/solutions/com.dslfoundry.dflat.runtime/com.dslfoundry.dflat.runtime.msd
+++ b/solutions/com.dslfoundry.dflat.runtime/com.dslfoundry.dflat.runtime.msd
@@ -25,7 +25,7 @@
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" 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="18" />
+    <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/solutions/com.dslfoundry.dflat.runtime/models/com.dslfoundry.dflat.runtime.scoping.mps b/solutions/com.dslfoundry.dflat.runtime/models/com.dslfoundry.dflat.runtime.scoping.mps
index e865f02..9fbd56b 100644
--- a/solutions/com.dslfoundry.dflat.runtime/models/com.dslfoundry.dflat.runtime.scoping.mps
+++ b/solutions/com.dslfoundry.dflat.runtime/models/com.dslfoundry.dflat.runtime.scoping.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="11" />
-    <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="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
   </languages>
   <imports>
@@ -136,6 +136,7 @@
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
+      <concept id="8329979535468945057" name="jetbrains.mps.lang.smodel.structure.Node_PresentationOperation" flags="ng" index="2Iv5rx" />
       <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
         <child id="1145404616321" name="leftExpression" index="2JrQYb" />
       </concept>
@@ -421,8 +422,11 @@
           <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
           <node concept="2xdQw9" id="7CM0FuT57gP" role="8Wnug">
             <node concept="3cpWs3" id="7CM0FuT57gQ" role="9lYJi">
-              <node concept="37vLTw" id="7CM0FuT57gR" role="3uHU7w">
-                <ref role="3cqZAo" node="7CM0FuT57gH" resolve="r" />
+              <node concept="2OqwBi" id="2miV12aGIGU" role="3uHU7w">
+                <node concept="37vLTw" id="7CM0FuT57gR" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7CM0FuT57gH" resolve="r" />
+                </node>
+                <node concept="2Iv5rx" id="2miV12aGIGV" role="2OqNvi" />
               </node>
               <node concept="Xl_RD" id="7CM0FuT57gS" role="3uHU7B">
                 <property role="Xl_RC" value="ADottedScope.getDotExpression: " />
@@ -477,8 +481,11 @@
           <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
           <node concept="2xdQw9" id="7CM0FuT57JH" role="8Wnug">
             <node concept="3cpWs3" id="7CM0FuT57JI" role="9lYJi">
-              <node concept="37vLTw" id="7CM0FuT57JJ" role="3uHU7w">
-                <ref role="3cqZAo" node="7CM0FuT57JB" resolve="r" />
+              <node concept="2OqwBi" id="2miV12aGIH5" role="3uHU7w">
+                <node concept="37vLTw" id="7CM0FuT57JJ" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7CM0FuT57JB" resolve="r" />
+                </node>
+                <node concept="2Iv5rx" id="2miV12aGIH6" role="2OqNvi" />
               </node>
               <node concept="Xl_RD" id="7CM0FuT57JK" role="3uHU7B">
                 <property role="Xl_RC" value="ADottedScope.getDottable: " />
diff --git a/solutions/com.dslfoundry.dflat.structure.test.editor/com.dslfoundry.dflat.structure.test.editor.msd b/solutions/com.dslfoundry.dflat.structure.test.editor/com.dslfoundry.dflat.structure.test.editor.msd
index 797db85..1cb6c3e 100644
--- a/solutions/com.dslfoundry.dflat.structure.test.editor/com.dslfoundry.dflat.structure.test.editor.msd
+++ b/solutions/com.dslfoundry.dflat.structure.test.editor/com.dslfoundry.dflat.structure.test.editor.msd
@@ -30,7 +30,7 @@
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
     <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="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:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="5" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />